I would stick with 2 dice (or maybe 2@3). This pick best is just ridiculous. Seriously, the more and more errata (and “FAQ” - lol) they add, the worse the game becomes.
MOVED: Is there room for a defender retreat option?
This topic has been moved to House Rules.