Yup, sounds like you did what was prudent and courteous.

Agreed. You probably could have squeezed in ahead of the Warrior
without much hassle but considering his tone on the radio I think your
extending downwind to slot in behind him was a good call. As for the
knucklehead that taxied down the runway necessitating a go-around, I'd
have had a tough time not saying anything on the frequency about the
lack of courtesy. I usually just bitch on the intercom when something
like this happens : ) If it's such an egregious show of stupidity
that I just can't help myself I'll have a word with the offender on the
ground and not on the radio.