Augy, the 7-cell Nimh will help a lot. Also, experiment with props, try a 10x4.7 and it might fly better. Put as much throw in the rudder as you possibly can.

My TM underwent some major changes...sp280 w/4.1gearbox. The weight went up quite a bit, but it flies great. I'm using an 8-cell 700AAA Nimh and it will climb like crazy, also handles wind better.

This morning I figured out exactly where the powerlines are in my yard...oh well, a bit more epoxy and it will be as good as new.