If the choice was mine, I'd pick up the 8th Gen. The overall size (15" v 17") and power efficiency should also be considered.
The GTX 1070 Max-Q isn't too much slower. GTX 1080 Max-Q, on the other hand, is significantly slower than the regular GTX 1080.