Thanks to the assistance of the board, I emailed MH and received a reply this afternoon confirming a day room at the Sama Sama hotel for both the 7 hours transit from KIX-CDG and the 17 hour transit on the return. It will be good to have somewhere to leave bags, have a swim and shower before taking the airport express into the city.