Help please - Spec for new Desktop

To put my request in context, I started my personal computing life with the launch of the IBM PC and I was already a ‘mature’ R&D manager! My present PC is showing its age and I want to replace it. I am an experienced user but my technical knowledge is a bit superficial. I have arrived at the following spec. but I need advice on whether it makes sense. I am not a gamer but I am a photographer, shoot in RAW and use Nikon Capture NX2, which is hungry for resources. I have a 2.5in Intel® SSD 520 120GB, as a devoted cache, which I plan to keep.

I am basing my thoughts on a custom nSpire H11 Pro, with the following changes:
ASUS PRIME Z590M-PLUS Intel Z590 Chipset (Socket 1200)
Would the ASUS Prime B550-PLUS be just as good for my use?
Crucial 16GB (2x8GB) DDR4 2666MHz Memory
ASUS Phoenix GeForce® GT 1030 OC edition 2GB GDDR5
WD Blue™ SN550 1TB NVME
WD Black 1TB 3.5" HHD
ASUS DRW-24D5MT 24x DVD

I am not sure what card to use for WiFi, as I live in a long home, with WiFi unfriendly internal walls and with my study/Gloryhole is at one end and the living room at the other. So I use a powerline network but WiFi in the bedroom.

Your thoughts and suggestions would be most appreciated.

Regards

Jeff