I tend to agree with you. The commas seem to me to be least obtrusive and most logically justified in the examples with "then". I probably wouldn't bother with them even here, but I think some people would.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.