Damn after all this I know god damn well what I want. I'll see what the best laptop is a year from now, when the either the gen 4 comes out, or the gen 3 drop in price.
Looking at the Sony S Series, the XPS15z (if they drop their prices dramatically), and the HP Envy 15 ((if HP fixes the problem with its screen, (reds displayed as orange)).
Most likely I'll end up getting a Sony S Series since they have an extra slice battery that adds a crap load of battery life, it has manual graphics card switching without having to reboot, and everything else I want. 1299$ at the config I want, hopefully prices go down. I'll still get it if the price stays the same.