I'm not one to usually suggest extra roles, but then, how about a Mafia Doctor as well? It will fall under the same rules of the normal Doctor and can only save themselves twice. Just putting that out in the air.
Imagine how much harder it'd be to trust the Doctor for the TP, since there are two. It'd be difficult to pinpoint Mafia suddenly, and at the same time, TP could be framed.