And no, that isn't altruistic enough.
Besides the fact that Musk's plans are impressive and admirable regardless of altruism. No one is asking or expecting Musk to forego making boatloads of cash. He is and will continue to be wealthy, and that's the entire point: it's possible to do good without doing charity. Likewise, it's possible to do charity without doing good.