It is time to upgrade my 8 year old slooow desktop. I would like to keep the purchase of a new machine on a reasonable budget, $1500 max but less than $1000 would be preferred. I am not interested in building a PC myself but would be okay with performing RAM or SSD upgrades myself. I recently purchased a decent IPS display, so I do not need to factor that into the cost. PC, no Mac. Limited video editing, mostly stills using Adobe CC. What would you guys say is the bottom I should be looking at for processor specs, processor core count, RAM and GPU, SSD size, but still be buying a decent machine I will not have to replace in the next few years? AMD vs Intel processor?
My laptop recently died, I do not really need one, but did think about buying a quality laptop for processing and keeping my archaic desktop for surfing, music, etc. Thoughts on a laptop vs desktop? I would use my monitor with the laptop for any serious editing. And I will restate that I do not really need a laptop (I use the wife's or my tablet), but thought it might be convenient to have the ability to view and process my images when I am away from home.
I plan on upgrading my camera in the next year or so, a 5dsr or A7rii, so I will be working with larger files sometime soon, if that makes any difference?

Much appreciated.
Samsung has a really good warranty.
