Yes this has been planned for a while. But accelerating the existing schedule by 4 or 5 years would almost certainly result in a large increase to the existing $843 million dollar contract that Space X has. Elon definitely has a conflict of interest here.