I think I would change dining rooms for all of you, Mo.
Sapphire has 5 dining rooms! and 3 1/2 of them are open seating. I know you host a table but you could all easily agree to eat in a different dining room at the same time. Why continue if the waiter is not up to snuff?
I am the editor, but I also speculate, ask questions and play devil's advocate. I reserve the right to change my mind.