Sorry I think Bolton is a big mistake, have never ever trusted that guy.
Maybe Trump has a particular assignment and end of Bolton's tenure in mind. I suspect McMaster was a leaker.
I mean seriously, how may "good" choices are there?