Shield and bludgeoner?
Sword and board rhymes, though, and I’ve heard it since the first RPGs I’ve played.