1 Town Vigilante
1
Town Doctor
Town Non-consecutive Doctor1 Town Mason Novice Roleblocker
1 Town Mason
8 Town Vanilla
1 Mafia Watcher
1 Mafia 1-shot Strongman
1 Mafia Goon
------------
I think the above proposal is improved over the original one, in terms of balance.
Idea:
For the doctor if you don't want them to consecutively target the same person, you could apply non-consecutive as the modifier for the doctor then.
BUT if the doctor protects on n1, then is roleblocked n2, then decides to protect on n3 and is not blocked - they still can't protect .