Used GoToGate, a major OTA in Europe, and opted for the safety upgrade at https://t.co/Q7ylGcHT5x for an additional 4000 yen. Judged that a minimum 80-minute layover was fine based on previous arrival history. Glad there was no wait at the check-in counter for both departure and return!