I think NASA was getting out to 2040 for the return mission, without any StarShip involvement, anyway.
We have been terrible at predicting technological advancement rates in the past, so what StarShip is capable of doing at various points in the future isn't really a good planning basis. (Think about the technologies that the movies "2001" and "2010" showed, compared to where we really are in 2025, not to mention Musk's proclivity for making unrealistic schedule statements.)
When we say "StarShip" these days, we tend to think of the current upper stage of the SpaceX megarocket. But, there is really no reason that other upper stages could not be developed for various tasks. I expect that the SuperHeavy first stage would be able to put a Mars lander with a return stage on the Martian surface, if someone wants to pay to do that. That is an entirely different proposition from having a single StarShip of current design fly the same mission. The use of multi-staging is actually the "proven" technology for such missions to the Moon, including the Apollo and Chinese missions with returns.