I would just as soon rip out Swap altogether from tournament play and replace it with Sudden Death. I don't see why RNG needs to be such a prominent factor in deciding who wins and loses.

Further, I don't see how this proposed solution really helps much of anything other than preventing a player from losing Lightning and getting back Gaelicat. Swap's just a gimmick; it offers no tangible benefits in competitive play. Any time during SP that I lost one of my 8s cards, I just got back another variant of it. It was boring. I found myself wondering why we don't just do Sudden Death instead. (Ties in a tournament. What a concept. Could you imagine the NFL playoffs with ties?)