I'd go with the stopover, simply so you don't risk losing the upgrade in the event of any problems. Another downside however is that you'd probably have to book 2 nights hotel in BKK, but accommodation is very cheap, especially if you avoid the top end properties.