Yup, we’re going back to Chamonix, probably staying here., obviously going up in the world; it’s next door to the one we used in 2011.
It seems that it is recommended to travel by road from Geneva to Chamonix, but this page may help if I decide to go by train.