I'm in the same boat as you. Technically, I could get the professional 105mm f2.8, but I've come to appreciate my earned savings much more. I'd rather watch it grow and continue creating with minimum spending.
I'm definitely buying some macro filters haha. Do you have a recommendation for a specific brand? I also shoot with the Nikon D7100.