I think that Pushing Hands in T'ai Chi Ch'uan (which can be translated as "Supreme Ultimate Fist" or "Supreme Ultimate Boxing") would be very good for you also.
Or Aikido. It is often easier to find a good Aikido school than it is to find a T'ai Chi school that both teaches and understands the martial aspect of T'ai Chi. It has become easier in the last 10 years or so, but it is still more common to see T'ai Chi taught more like a form of "yoga" or a simply an exercise than in its true martial aspect.
Much success!
