I would stick with something familiar. Buy a used 7D2 and then upgrade to the 7D3 when it comes out and sell the 7D2.
I bought a Seagate 4T USB-3 and use it on Windows 10. Worst drive I have ever bought. It takes 26h to do a backup and my Western Digital 4TB does it in 5 h. The WD drive has encryption as well and the Seagate doesn't. Will never buy another Seagate
I bought the Dell XPS15 with 4K display and love it. I upgraded it myself to 3TB internal storage. Works flawlessly
Joderale: in your post about EF and E lenses- EF lenses fit EVERY EOS camera including the film cameras. The EF-S lenses only fit cropped sensor cameras such as 7Dii, 80D and lower cameras such as Rebels
Go with the 80D or 5D4 depending on how much you want to spend. Keep in mind that none of your EF-S lenses will fit on 5D4 but will fit on 80D