If I was working with the D&D 6 attributes again I would:
Tie all WIS skills into INT, except Insight, which goes to CHA. I would also move initiative to INT. If you want to be skilled, hard to surprise, or quick off the drop, you need to be a quick witted PC.
Move all casting to WIS and make...