Is there a geometrical shape, that will always settle in the same orientation?
Doesn't help on the moon, though, where the surface is soft, and may contain boulders.
What if airbags inflated around the lander? The external shape of the lander-with-inflated-airbags and the internal weight distribution could make it self-righting, while shielding the external fixtures and the hull.
Just throwing ideas around and role-playing spacecraft designer.