Hello gto234,
I think that the first option may be better, as GTX 1060 should give considerable speed up for GPU-supported stages compared to GTX 1050 Ti configuration. However, with the laptop you should also check, if the cooling system is good enough in order to deal will near extreme workload on CPU and GPU during long time.