I vote more skills and more combat power, particularly at higher levels.
For skills, I prefer a suggestion I saw on these boards some time ago, which was to give the Fighter a "noncombat specialty".
I don't remember the details of the original work-up, just the concept, which I thought was...