Thanks for the suggestions johnny, but as I mentioned in my original post, those part numbers are discontinued, and I really don't have any grinding tools so I'm looking for an alternate solution!
I'd hate to have to bring it in to the dealership for service after all these years...