I agree Amber you tank is not overstocked, but look at your tank inhabitants, not a single one is territorial like you have mentioned, unlike the clownfish he currently has which is a territorial, established and an active fish.
Also i think the choice to go over the stock limit should be made when you have very good understand of your reef, and have researched your purchases, just like you have. I think new comers getting their first fish or ones haven't researched the hobby should stick with the stocking rules, which is why i tell everyone the 1 fish per 10 gal rule.