I have an idea, Sjg11. Along with their alignment, town or mafia, they also have an alternate win condition, which ill make that one person win. This will fit in with Survivor, where only one person can be the ultimate survivor. However, in order to make sure this is not individual, if the town/mafia wins before one person's win condition is successful, which I will make very possible, then the whole team wins, to keep the basic mafia/town alignment. I might even throw in one or two third parties, with obviously a different win condition.
As far as switching goes, I think I can still keep in the element of switching two people's roles every night, which will be slightly weighted. For example, I wouldn't switch a watcher with a serial killer who has to kill 3 people to win, although I am not likely to include a win condition like that, it is just an example.
What problems are with this new, edited version? Also, just curious, has anyone else heard of Survivor? If not, here is the link, it is a great series, and is very fun to watch.
http://en.wikipedia.org/wiki/Survivor_(U.S._TV_series)