The upgrade That I am Doing to my PC

So lately I have been noticing that my that computer is starting to die. It has been giving me so many errors and at this point Its just time for the upgrade. I have been planning this upgrade for months so my specs right now is it has an AMD Athlon 3500+ Processor at 4GB of RAM and what I am trying to get either an AMD FX Quad Core processor and a MSI motherboard that can handle 32GB of RAM or a Intel 6th gen i7 6-core Processor and a motherboard that supports it and 32GB of RAM. Right now I am currently running Windows 7 Pro and I want to upgrade that to Windows 10 pro.