Melee Warrior + Shaman is a great combo... Totems are great melee buffs, especially improved Strength of Earth and Windfury. Post L50, you could take a resto shammy and put him on /follow and everything the warrior would need would be insta--cast (totems, earth shield, etc). I wouldn't plan on mixing two melee DPSers, though. Druid also wouldn't be bad since HoTs can be cast on the run and some of their DPS is insta-cast.