I called him (he was still in the office at 10 to 8!) and he said to come in tomorrow.. he didn't sound worried so I guess I'm alright.
and yes it is a permanent filling
Well, dental problems are often life-long, but not very often life-threatening (unless you're a secret agent with a cyanide tooth). But yes, painful teeth do demand attention.