I'd say you did the right thing.
As for "I guess I might have cut the guy off"
From Church? I would say if he was in the same service you were in, he REALLY needs to be there. Seriously though, it's hard to avoid being boxed-in on an unfamiliar road - but checking and double checking the traffic (if indeed it was cutting someone off) would avoid some of this so-called "road rage".
All else you did was perfect.
Just my .02