Update! Arrived last night in BKK. Immigration officer asked me how long I'd like to stay. I told him 120 days. He smiled, stamped my passport and off I went!
Btw, I have an absolute clean stay history in Thailand. I'm coming for twenty odd years now!