Replace the WH correspondents with a lottery system, rotated every few months.
I’d say replace the White House Correspondents with invitees only. He can give his presentation to the WHCA, dismiss them, then call in the invitees for questions. That would surely piss them off.