I plan to have the latch assembly removed and sonic tank cleaned, then re-lube.

Hopefully it will just be a clean and put it back procedure, but if not I wanted some ideas to fall back on while I wait until a good 2 door latch surfaces that hasn't been priced like gold.