I would buy an MP that had only 35/50/90
The MP seems to be a pretty strong camera for resale right now. I don't see your desired mods to be too much of an issue. It's far more likely that a swing in the Asian economies will have a greater impact on resale values of all MPs. I say go for it and get a camera that you want to use. And then resale becomes less of an issue.
Where are you having the CLA done?