I stopped fighting that battle a long time ago. People screw my long name up, so I'm just rolling with the short version until I die I guess.
What irks me are the older millennials, X-ers, and (certain) boomers who get peeved when you call them "Mr. {LastName}" or "Sir". Dang it, I'm southern...