just my $.02 but...
you could compromise between the two bonuses and just use the highest applicable bonus and add +1. I say this because of a pseudo-precedent in DotF with the Mysticism prestige domain - if you already get your CHR bonus to your saves, you only get +1 more. Don't forget that the spirit of the game would still be upheld, the player-in-question would still get some extra bonus for the unique situation, and the player's ability wouldn't skyrocket to the near absurd.
We now return you to your regularly scheduled propaganda.