Hey Pilgrim,
You may have asked a loaded question Some of the folks here with tons of Tai Chi experience might find it hard to give you a simple answer. Because you and I have a shared history, so to speak, I think I know where you're coming from. I'll make a suggestion, albeit, it comes from only a little Tai Chi experience.
My opinion, you will likely enjoy CHEN style more. Here's a link to a site where this guy discusses (very briefly) some of the basic differences between Chen, Yang and Wu.
http://www.taichiacademy.com/wu.htm
The reason I suggest Chen is that the pace changes thoughout Chen style and it has very deep stances and is wonderfully liquid. It also was suggest in a Tai Chi forum I stumbled across that Chen is possibly more application based with more explosive strikes. Certainly not to say Yang style doesn't possess those qualities, but Chen seems more popular amongst those looking for combat applications - at least according to the forum I looked through.
My post is likely not terribly helpful, but it might give someone else with more experience something to resond to.
shawn
Doctors: "Mr. Simpson, this procedure MAY increase your brain power ... OR it may KILL you!"
Homer: "Increase my killing power, eh? I'll do it!"