At this point it isn't just SpaceX's Starship, but in general the direction Artemis is heading in, since the secondary lander design (from Blue Origin, Lockheed Martin et al) that was recently chosen also uses in-space refueling and is designed with Lunar ISRU in mind.

Shelby finally retiring has been a great boon for NASA's human space exploration programs.

Also, technically the Lunar Gateway would fit your second point, considering that it's split into a separate habitation module and power+propulsion element.