Agreed...given everything you just rattled, off, I'd probably go for the EFS 17-55 as well. A couple of reasons:
1. You have the 100 mm L Macro. Which is a great lens itself. Somewhat similar to the 135 mm and only 1 stop slower.
2. If you replace the Tamron, you only would have one wide lens. Plus selling the Tamron makes the net purchase of the 17-55 much less than the 135 mm (I assume you wouldn't sell another lens if you bought the 135 mm).
3. Make sure you have the best of the lenses you will use the most. I know you posted a lot of photos using the 17-55 when you had one. I don't recall seeing too many from the Tamron. And, even above, you indicate you prefer the 17-55.

That said, I can see this being a tough decision.