Would you have made this trade?

As you already noticed wide angle and macro are really completely different. So, you might enjoy your new lens or not.
To me 12-24 is one of favourite lenses.
Lately I can do with 12-24, 35/1.8 and 70-300 VR.

So, I would suggest you purchase 35/1.8, which is inexpensive and quiet good lens. Or, if macro is important, you might find useful 40/2.8 which is also inexpensive lens.

You can check some of photos I took lately. Good share of photos was taken with Tokina 12-24:

2012