I wouldn't include the Mastermind at all if there's only two non-eels to find, as it weakens the Hunter's role severely. Imagine if there actually WAS a Godfather/Mastermind last game, and it was me-yeah, we'd have won much easier if I was 'known' as a completely normal villager instead of ratted out as a Mafia by you. Having exactly one meaningful guy to search also makes it a lot harder for the villagers to do anything meaningful with said hunter. But other than that, yes, that's basically how I'd do it.

Also: I can assume that, if we have roles like the Hunter and the Savior, that our abilities are activated during the day but take place during the night round (the questioning and the protection)?