Unless you have a particular locksmith in mind who has demonstrated expertise in these things, I'd say the dealer is the better bet. (And I say this as someone who doesn't particularly favor going to the dealer first.) Particularly if you have to deal with the air bag and you're going there anyhow.

Best of luck. Someone screwed with the lock on my Toyota and I ended up going to the dealer with it, so I understand the annoyance level here and sympathize.