This Build here will give you a much more solid experience, the inclusion of the new Pascal 1080 will help with video editing/rendering. Because you are also in the $3000~ prices range you are able to afford much more premium parts.
I have been looking at buying a new laptop for a while. Yesterday I saw this deal on an MSI GS60. What do you think? should I upgrade from my old T420?