Do you still have the hybrid? You mentioned you also have a folder.
Just ride more carefully, I don't think a certain type of bike will guarantee
your safety, a lot of it is up to you.

I've been riding for the last 5/6 years in NYC using SPD clipless pedals.
Commuting to work over 30 miles 4 days a week and doing longer Sunday rides.
The last couple of years on my 2009 Fuji Newest 1.0 roadbike. Other than 1
spill I had on a metal plate on the George Washington bridge one rainy day,
I have been crash free.

http://www.youtube.com/watch?v=pFf8l6kZtlU&feature=plcp