You should be able to go to the USPS and do a change of address for yourself. That way every time mail for you is sent to your tenant, it will go to you.
https://moversguide.usps.com/mgo/move-combined-mobile will let you do it online.
It's a pain that you have to do this because of their incompetence. But it will save you the embarrassment.
It may be harder to do that now.
One of the changes USPS made in recent years is that they are securing mail forwarding. That type of arrangement may not be possible.
go to the *private company the usps sold the captive market to.
This is actually a great idea.