So.... looks like the part that is going to get here last for the server rebuild is:
The Noctua NHD-15 heatsink I ordered! Which is estimated to arrive July 8th!
This is very stupid. But also, it's a roadblocker - AMD CPUs where the model numbers end in X don't come with stock heatsinks, they expect you to buy your own because the X CPU's are overclockable.
I don't do overclocking, (and the one time when I did, my 1700X was ancient by the time I even started looking into it) but I do play alot of video games, and my server in particular runs alot of ffmpeg encodes, so the big beefy heatsinks are really helpful.