You're correct about the federal charges. There's also the possibility that he pre-emptively and secretly pardoned himself for all future crimes while President. There's a legal argument to be made that he cannot do that, but it's never been tested before, and I would not expect the SCOTUS to side with justice in that case. It's maddening that they haven't prosecuted him for his many many crimes already.