After this is all over, we probably need to do something about presidential pardon power. Getting a constitutional amendment through is hard, but I don't see another option.
A different understanding of the extension of the presidential pardon when it creates a conflict of interest from the SCOTUS would be one possible path.