It's ridiculous to limit people to 5 types of lenses. A macro lens is useless to someone who doesn't shoot macro at all.
Anyway, despite being a Nikon user and not Canon......
1. Have: Sigma 24-70 mm f/2.8
Want: Nikon 24-70 mm f/2.8
2. Have: Nikon 105 mm f/2.8 VR macro
Want: Nothing. I have what I want.
3. Have: Sigma 30 mm f/1.4
Want: Nothing. The Sigma is perfect on my D300. However, it's good to get a FF version to prepare for the inevitable, in which case, I guess even a new 50 mm f/1.4 would do the trick (but not as well as my Sigma 30 mm, which I'm in love with).
4. Have: Tokina 12-24 mm f/4
Want: Nikon 14-24 mm f/2.8 (Not because it's better, but because it's full frame. Better preparation for the future, and less of the distorted areas of the lens)
5. Have: Nothing comparable.
Want: Nikon 70-200 mm f/2.8. I'd settle for a new version of the AF-S Nikon 135 mm f/2.