I know your pain, Anon... I also totally second this idea. <3

I can totally see a Neutral or Evil Vault Dweller being the one to take a formerly bonded with the Master Charon and rebuilding his wounded psyche to make him into the body guard we all know and love. (Sadly, I don't know if I have the skill to make it good ... just torture and angst.)