You're already half way there on your war, stick with him they are the best tank class by far. To fix your issues with aggro try a different rotation. When you pull, open with enrage and battle shout. Battle shout is more threat than demo shout. After battle shout then demo shout. from there you can be situational. Either spam battle shout for more aoe threat, or use single target abilities like revenge, shield block/slam, and heroic strike for damage + single target threat.

Battle shout produces 55 threat to all aggroed mobs per player buffed and caps at 5 players.
Demo shout produces 43 threat to all aggroed mobs and doesnt have a cap.
So battle shout is better threat unless you pull around 7 mobs and they are all alive each time you demo shout.
But demo shout debuff is essential to tanking so you have to have it in your rotation somewhere.
Thunderstomp is terrible threat per rage and not useable in defensive stance.

Make sure you get anger management asap on your tank. It's the best rage generator of all by far and more rage equals more threat.
If you are power word shielding your tank, STOP. Never shield him unless it's life or death.
Ask a blacksmith to put a shieldspike on your shields.