Would this spec do?

Hi everyone, I'm a professional photographer (yes, an actual-7-year-properly-trained-one) and I can easily process between 1000 and 10,000 shots (depending on what's needed) using Photoshop CC... I know Lightroom/other software is probably better for such vast amounts, but I know Photoshop inside out already.
When I've got down time, when it's too late for the neighbours for me to start playing guitar or when a film or book just won't do, I would use my laptop for games - pretty much at the moment just AC Black Flag, Rainbow Siege, Hitman Absolution, Just Cause 3, GTA V, Metal Gear Solid and ARMA.
My laptop would also be for music (as well as while editing) and of course internet/emailing/youtube/etc.
I've got 2TB worth of external storage already, and don't mind buying more.

So, if you've lasted this long through all my drivel... my main question is would this spec stand up to what I'm needing? :
Would it be worth looking at a 32GB RAM and an M.2 SSD Drive, or leave them for years to come to upgrade to?

Intel® Core™i7 Quad Core Processor: i7-6700k (4.0GHz) 8MB Cache

Memory (RAM): 16GB HyperX IMPACT 2400MHz SODIMM DDR4 (2 x 8GB)

Graphics Card: NVIDIA® GeForce® GTX 970M - 6.0GB DDR5 Video RAM, DirectX® 12, G-SYNC

Memory - Hard Disk: 500GB Samsung 850 EVO SSD, SATA 6Gb/s (upto 540MB/sR | 520MB/sW)

mSATA/M.2 SSD Drive: NONE

Sound Card: ASUS™ XONAR-U7 Compact 7.1 USB soundcard and headphone amplifier

Bluetooth & Wireless GIGABIT LAN & KILLER™ 1535-AC M.2 WIRELESS GAMING 802.11AC + BLUETOOTH 4.0

USB Options: 4 x USB 3.0 PORTS (1 x POWERED) + 1 e-SATA/USB 3.0 PORT COMBINED

Battery: 8 Cell Lithium Ion Battery (82WH)

Power Lead & Adaptor: 330W AC

Operating System: Genuine Windows 8.1 64 Bit - inc DVD & Licence

 

This spec list will suffice. I have something similar but a slightly worse graphics card and I can run all high end games on high graphics settings.
Also good luck on your photography carreer! I always enjoy some beautiful photos