Least said, soonest mended! Both trips were tough but the important thing was that Bangkok was wonderful and the transit pains were worth it!
The takeaway lesson to share is that if you are connecting through Bejing make sure you have at least 2 hours, preferably 3.