Just saw this thread lol... I had posted this in a different thread as an alternative to changing anything about the Prisoner
If not having Ed on the team isn't an option, why not give those characters the Boss status back and make it so his Passive Agression is neutralized by Bosses as it is in the campaign?