Actually it seems (based on personal observation, not testing) that polearms, with the 2H fix, are effective against calvery if you can get them into melee, without taking a charge. Engage the cavery with spears and then rush in your 2 Handers.