The satisfaction of getting it right with an old lens is great, but if that hardly ever happens it spoils your fun in photography.
So I would in that case go for the zoom, regardless of the quality. Which one? For you to decide based on your way of shooting. If you need the wide side, 17-50; less wide and a bit more aiming towards portraits, the 28-75.
Your signature states an 28-70 lens. Try that for a while and see if you're missing the wide side.
And a note on the macro:
best macro results are often obtained using manual focus
If you want to use the macro as tele as well, AF comes in handy for you.
PS I would not sell the Taks; just keep practicing