Yes, also the lunar variant won't need a heat shield so that will compensate for the extra leg mass. Not sure what their plans are for a heat shield for Mars.

They're planning on catching starship as well however, as the in-orbit refueling will require a lot of starship launches that aren't going anywhere except orbit and back.