I'm a huge fan of both classes, but Warrior makes more sence for a few reasons.
A war leads the party, so if your using hench/hero you have a much easier time with a war in front of them than a ranger at the back.
A war can addapt to every map through build changes. Most rangers will run the same build on every map, this gets boring sometimes
Since all of the op previous chars are ranged caster/attackers a melee would give you a very different perspective on the game.
While you can use War/ranger a war is much more likely to experiment with every secondary as each bring something that he can use in the battlefield. A ranger can use anysecondary but rarely needs to and doesnt seam to gain as much benifit from doing so...for the most part.
In the end you'll likely want both, time to buy another char slot !!