I'd think macro and landscape would be the very reason to go FF. Think, if you are shooting 1:1 macro, you can capture something as big as 35mm x 24mm (ok, almost). With an APS-C, you fill up your sensor with smaller magnifications.
On the landscape front- resolution, DoF (a lot of people think everything should always be in focus for landscapes), image quality, superior performance at low ISOs are compelling reasons to go FF.
The 5DII is a fantastic camera (and that's still an understatement), and since going from T2i to 5DII you won't feel any of the latter's shortcomings (with respect to fps, AF, metering, build quality as in case of 7D-->5DII), an upgrade is a no-brainer.
On the other hand, I've had mixed feelings about the 17-40. It didn't strike me as a sharp, contrasty lens. I like the 10-22 on my 7D much better than the 17-40 on an otherwise excellent 5DII but your mileage may vary. The 17-40 on the T2i would be very mediocre, no doubt about that bit in any case- so I hope you upgrade soon if you end up buying the 17-40.
I would say don't upgrade to FF solely for the 17-40, but consider moving to FF for other reasons. The Samyang 14mm is another option which provides an amazing 114˚ angle of view on FF...
+1. Or, I'd save for the 16-35mm...