I ended up replacing the buckle latch assembly as recommended. Found a salvaged unit on eBay for a good price and did the swap myself, pretty simple task. So far so good, no faulty seat belt warnings.

Thanks for all the feedback and help.