Commuter indecision

Commuting was iffy monday, nothing really bad but on the way in a car passed too close then stopped at lights, I went up to driver window, a young lady all dolled up, I said calmly "that was too close" for a second she looked like she was about to ignore me but then turned to face me, mouthed "sorry" then gave me a big smile. Non-plussed, sorry but a nice smile isn't gonna cover it, rode off shaking my head, she did however give me a wide berth when she next passed. On way home in almost stationary traffic a car pulled out from a side street right in front of me, I slowed then when I went to undertake the driver pulled left cutting me up, I was expecting it tho so slowed and as the car came across I rapped the rear bodywork with the back of my hand to let them know I was there (and not happy) turns out fiat puntos are made of tinfoil and there was a massive thunk sound. Oops. I passed on the right and bloke in passenger seat had got the driver (his mum?) to wind her window down and he was hurling abuse at me, I switched to the right hand side of the line of traffic and put the power down, (and spent the rest of the ride looking over my shoulder) different route home for a few days I think. Rode route 55 again on my pompino yesterday, it's a very gentle downhill most of the way in which is fine and full guards on a car/traffic-light/junction free route (well ~70% of the route) is lovely. Gearing is just a bit too high for the way home tho and will have to see if guards survive or if they get rattled to death. Still unsure whether to change the pompino tyres and gearing (slightly gimping it's road capability) or try to fit full guards to my inbred. Or buy a 29er and run cx tyres with full guards. Or buy a pometamine for xc use. Or.... Or..... Hmmm.