Looks like you have a pretty good plan in place, don't forget to check ebay etc, its definietly a buyers market out there at the moment so deals to be had, you could look at a Ornament & Crime for Quantization as you get 4x for the money plus a lot of other things to play with.

Enjoy your spare HP, don't rush to fill every last space, this is not like filling sticker books. Resist the urge to 'complete' your rack, its never complete so just relax.

https://youtube.com/@wishbonebrewery