1. Ssd pcie and sata
As far as I know, there are at least 4 (even 6) sata connectors from the chipset only, 1 m2 from the chipset and 1 m2 from the cpu, so you are fine with your m2 and sata disks.
FYI, from what I read, m2 connector from the cpu is pcie4.0 on non-igpu 5000 series cpu, and pcie3.0 on cpu with intergrated gpu. Too bad I don't have enough hardwares to test 😂 .
2. RAM
Buy the best (for OC later) 2x 8GB RAM you can get, bus at least 3200, with heatsink of course. Normally, your system runs at 3200 max for common users, if you want more, choose OC profile, usually call XMP for higher options, 4400 max.
Hope it helps!!!!!