I would avoid the gestalt idea - it encroaches too much on other classes. If you want rage, play a barbarian etc.
In my opinion the warblade is what a fighter should be. Playing as a warblade is the quickest fix.
Otherwise, i think incorporating the ph2 ideas would be good.
In my E6 style game, characters play the warblade, and i use the fighter for npcs.
So tehre are warriors, the common foes, fighters, the more experienced ones, and then character classes for the real challenges.
So, in a single encounter, the party may fight 4 level 1 warriors and a level 1 fighter.
In my campaign, where being greater than level 1 means you're pretty freakin skilled, the majority of opponents are going to be level 1. My rule of thumb: if you're greater than level 1, you get core class levels. If you're level 1 but you're like a leader of the crew, you get a fighter level (ie a bonus feat). Fighters DO suck regardless, but they're better than you're average warrior!
As to the *still* remaining major difference between casters and warriors, what i do is say when you get a second attack, its still at you're highest bab. So 6th level (epic in my campaign) with high BAB gives two +6/+6 attacks.