Hi Matt,
Just checked out your site. Nice work...broken collar bone. Not fun with the 645D I'm sure! Heal up soon mate!
re: wides. I've never shot with the 25, but I've just had the 28-45 on loan from and really enjoyed it, though it is a beast of a lens!
If you go for the 28-45 you could probably ditch the 35. Even though I love my 35, there is very little difference between the zoom and the prime. The 28 is equivalent to about 21 in 35mm fov.
From all reports I have read the 33-55 will not provide you the same quality of file as the 35.
Not sure if that helped, but it if you are patient, it wouldn't surprise me if we see another wide wide prime arrive in the next 12-18 months!
Cheers
Andrew