[@WanderingDragon]

Make any changes you think you need to be comfortable with your character. The last thing you want is playing a character you don't wanna play.

As some advice, sometimes it's better to simply rehaul and rework the stuff rather than bang heads trying to make it work. That's just my two cents, of course. At the end of the day, it's your character.