Hard to say. What are your use cases? I would have said the introduction of the 1050 in place of the m series nVidia chips would signal a good opportunity to get in on a system, but you're citing a 2013 laptop as a replacement, so I'm not sure if I should recommend a newer high end workstation, a gaming laptop that also has delicious CUDA cores, or something else.
Your willingness to suffer shoulder injuries with an 8lb laptop does you credit (I hate everything over 5lb now, but I'm a pansy) and potentially lowers the price point.