I still have this super fun setup I want to try but I don't think we can get enough players:
3 Maf Goons
1 Maf Mason
9 Vanilla Civs
5 Civ Masons
1 Civ Angel (can't protect same person consecutive nights)
Masons are in 3 pairs - 2 civ pairs and 1 maf/civ pair where alignments aren't known.
If one mason gets lynched or night killed, the teammate mason dies as well.
If Angel protects a mason that gets hit, he saves that mason, but the teammate mason still dies.
I think this game has the ability to create massive amounts of butthurt and it would be hilarious to see how all the masons interact in game.