My guess is no. People want to talk about success and success is measured with marketcap and net worth. 99% of people who know Musk name have really no business knowing his name and care very little about electric vehicles.
My guess he also can't handle going back to 2014 levels of social relevancy and will try and run for governor or some other thing like that.
Musk is fundamentally an attention whore, he pumped the marketcap before the company was mature, it's not like Tesla marketcap grew spontaneusly.