Thanks to all that have replied, much appreciated.

Thinking about the stopover we have more time in Bangkok on the return section (5 hours I think) so it makes more sense to upgrade there but taking Brunos's points into account I think I'll get back onto the TA and see what price they can come up with.

Also thanks to BKKROP re the FF program, I decided to go with Thai's own in the end.

Thanks again,

Andrew