2010 Digital Storm build has died, need advice

Budget:
under 3K

Expectations:
A machine that will give me 6-9 yrs without thinking about upgrading.

Usage:
Photo editing with photoshop and a lot of gaming

Special Needs:
Nothing particular.

Specifications:
Chassis Model: Special Deal Hot Seller - Digital Storm Apollo
Exterior Finish: - Standard Factory Finish
Trim Accents: - Standard Factory Finish
Processor: Intel Core i7 4790K 4.0 GHz (Codename Devils Canyon) (Unlocked CPU) (Quad Core)
Motherboard: ASUS Z97-E (Intel Z97 Chipset)
System Memory: 32GB DDR3 1866MHz Digital Storm Certified Performance Series (Highly Recommended) (Hand Tested)
Power Supply: 1000W SliverStone Strider
Expansion Bay: - No Thanks
Optical Drive: DVD-R/RW/CD-R/RW (DVD Writer 24x / CD-Writer 48x)
Storage Set 1: 1x SSD (250GB Samsung 850 EVO)
Storage Set 2: 1x Storage (1TB Seagate)
Storage Set 3: - No Thanks
RAID Config: - No Thanks
RAID Card: - No Thanks
Internet Access: High Speed Network Port (Supports High-Speed Cable / DSL / Network Connections)
Graphics Card(s): 1x NVIDIA GeForce GTX 980 Ti 6GB (Includes PhysX)
Sound Card: Integrated Motherboard Audio
HPC Processor: - No Thanks
Extreme Cooling: H20: Stage 2: Digital Storm Vortex 120mm Radiator Liquid CPU Cooler (High-Performance Edition)
H20 Tube Color:- Not Applicable, I do not have a custom HydroLux liquid cooling system selected
Chassis Fans: Standard Factory Chassis Fans
Internal Lighting: - No Thanks
Airflow Control: - No Thanks
Chassis Mods: - No Thanks
Noise Reduction: - No Thanks
LaserMark: - No Thanks
Boost Processor: Stage 1: Overclock CPU 4.0GHz to 4.4GHz
Boost Graphics Card(s): - No Thanks, Please do not overclock my video card(s)
Boost Memory: - No Thanks, Please do not overclock my memory
Boost OS: - No Thanks, Please do not tweak the services on the operating system
Windows OS: Microsoft Windows 8.1 (64-Bit Edition)
Recovery Tools: Windows Recovery Toolkit (Bundled with Windows CD)
Virus Protection: FREE: McAfee AntiVirus Plus (1 Year Service Activation Card) (Not Pre-installed) ($35 Value)
Office: - No Thanks
Game: - No Thanks
Display: - No Thanks
Surge Shield: - No Thanks
Speakers: - No Thanks
Keyboard: - No Thanks
Mouse: - No Thanks
Portable Gaming: - No Thanks
Branded Gear: - No Thanks
Priority Build: - No Thanks, Ship Within 10-15 Business Days After Order Is Successfully Processed
Warranty: Life-time Expert Care with 3 Year Limited Warranty (3 Year Labor & 1 Year Part Replacement)



So my current 2010 Digital Storm machine had a simple hard drive failure, so I decided I can repurpose it with a new hard dive somewhere else in my house. But since it is a little behind the time, an upgrade would be needed.

I am looking for a system to last me 6-9 yrs without having to worry about graphic/cpu upgrades. My last one fit that spec, it was a 6gig, I7 920, Radeon HD 5870.

Graphics I am thinking a single 980 Ti would be sufficient. I do not think I will be doing any 4K gaming for the considerable future, but that may always change.

Motherboard, not really sure if I see a huge difference between the "best" ones, they seem to be similar to my untrained eye

I picked the I7 knowing that it is not much better then the I5 in gaming performance, but with photo editing would it be needed?


Thanks for your help.