Been slowly upgrading a prebuilt from 2009. I've upgraded everything but the mobo, ram, cpu, and cooler. Was hoping someone could do a sanity check on my build to make sure it's good for a few years at least.
In that case you may want to consider dropping down on cpu to get a better graphics card. His $850ish build will probably serve you better than going up on CPU and ram UNLESS you plan on putting funds aside for a GPU upgrade soonish.
That said, I would say an NVME drive will boost you quite a lot simply due to the read write speeds compared to a sata SSD. It will be noticeable.
I’d go with the tomahawk as it’s a solid board and usually recommended from what I’ve seen. Both are fine motherboards, but the tomahawk seems to be a little more “premium” compared to the b650-p WiFi. Also for a x3D CPU the tomahawk will offer a little more “power” and take better advantage of it.