While cool designs are indeed very tempting, and sounds like an insane opportunity, I personally wouldn't complicate current system by adding another combinations.
The way you solved the problem around weakness seems fine on the first look, but once you realize you completely eliminated a possibility to snipe this miscrit in any way, you introduced quite a big game-changer...