Is just make it so you can only have one kind of Marshall at a time. Which funnily enough is how I remembered it being.

Personally I found my elf Marshall (who had the only hope virtue -- still very nice) didn't tank that well until he's used fend or a marshall variant. Which isn't always possible if Igos is bashing you.