your config is consistent, I had the same dilemma for the storage disk, personally I opted for the 1TB SSD SEAGATE ... after all it is not so important, the best is to favor a good hdd for the system partition
swapping the 3700x for a 3600x for a better graphics card is a good choice I think (especially if you play with your PC)
swapping the 3700x for a 3600x for a better graphics card is a good choice I think (especially if you play with your PC)