Is my rig/order missing anything?

[Sondero]

you can also use good NVMEs (Samsung 970 EVO PLUS, or better PRO) for swap-file, instead of RAM.
It´s not perfect, but i couldnt see a real difference in the performance.