Agreed, your Gnome (INT) and Halfling (WIS) matchup makes more sense to me than CHA.
I'm not really sure what to give to Goblins. I have trouble getting past that I don't really see them as a PC race. To me, they look like -2 STR, +2 DEX, -2 CON, -2 INT, -2 WIS, -2 CHA.