Should I be friends with her and did I handle this situation correctly?

WOW i just read it all. I think she knew because shes seen you guys before and is probably trying to get an attitude with you and try to make you feel bad. Maybe she will stop girls like that you never know. I think you handled it okay but just be frienemies i mean shes only your waitress.