The only issue that needs to be fixed is TP, and even Invigorate wouldn't help with that. The DPS difference between WAR/DRK is nil, especially considering that every parse program currently doesn't parse DRK correctly and yet DRK is barely behind. The problem is at two and a half minutes you are out of TP with no way to regain it and WAR has literally unlimited TP in a single target situation. Paladin also suffers from this problem and has since release. Obviously if you have a bard you'll be fine, but not everyone is so lucky since bards are re-rolling!