use CoF or get the 20 haste rapid handle for your 2h, putting aa in str instead of sta is a waste imo, you dont get any crits so its useless to have the 2h without having it crit for huge amounts of damage... Id post my setup but im at work atm so my eof tree is a no go, but heres the crusader tree im using atm, works quite well, all the crits for dps, and hp and divine aura for tanking.
I had the exact same setup Pity had, with the 4 4 8 agi, sta, and int but i felt i lost too much tanking ability with the addition of a miniscule amount of dps from agi... i notice about the same (maybe 50-70 dps less ) dps with my current setup and i get the tanking benefits from a full sta line. A bit unusal setup but i find it works quite well for dps and tanking (mind that your swapping out gear and stances for the application).