I'll agree with that, but there does need to be some balance.
Perhaps that S+S infantry should be cheaper/more available (numbers wise) than 2H?

Also, I do think that 2H could stand to have more Def skill, there seems to be this misconception that plate made the wearer unwieldy. However I've seen a video of a person wearing field plate and doing cartwheels (I'll have to see if I can find that later).