Tough question- If you are going to keep the MIM Charvel forever do it because those are good upgrades but you still Have A MIM guitar and it's only worth so much. The Fender would probably be the better choice to do upgrades on and sink some money into.
In the end do what makes you happy...