In the UK, my starting point is 10% for "done the job" kind of service. Given what you describe, I'd be tipping somewhere north of that, similarly to you.
Exceptional service would be c20%.
Loads of posts on here but this is spot on and exactly where I am when I eat out.
Sent from my iPhone using Tapatalk