I would have lots of AMP Duos OS pockets. (I love them even more now that I figured out that I can also use them as a cover over a trifolded pf- I just have to size down the pf).
Also a day's worth of fitteds and fleece longies and soakers.
For fitteds, I'd have a combo of Drool Bucket Baby multi-size fitteds and the cheap thin fitteds I got for free. I love to have some fitteds to let his bum air out.
I'd keep the Softbums I already have, because they've been really trustworthy. I'd also keep the Swaddlebees side snap pockets- even though they leak sometimes, I still like them

But I wouldn't buy any more of either of those.