Please consider the i5 machines with SWITCHABLE GRAPHICS.

The i7 except for that rare dual core model is one laptop buyers should avoid unless they can live with the issues you noted.

=> The other item I think you need to reconsider is the 17 inch screen. That's a power problem as well as turning a laptop into a desktop.

Between those two items you should fair much better the next time around.
Bob