I'm a server and you're doing it absolutely right. If someone tips even a couple dollars over 20% we notice it and appreciate it, and we will remember you. The difference between a shitty tip, a standard one, and a lovely one is usually only a few bucks.