All sorted - with your help, thank you.
They answered the phone straight away and within 7 minutes the whole dreadful 17 hour layover resceduled trip is now a sensible 1:45 with a better BKK departure time.
We just have to depart BKK a day earlier. On the grand scheme no big deal.