I dunno, your solutions seem like they work fine balance-wise but they don't feel right. I mean, 13A is supposed to be a "love letter to D&D," so having a situation where HP could be based on CHA seems very strange. And I say that as someone who doesn't mind slaughtering sacred cows!
13 True...