Hi, im looking to buy a laptop for gaming and work, i currently have a lenovo Y740 with RTX 2070 maxQ with 16g of RAM and i7 9750H, 256SSD 1TB HDD, this laptop is good but battery dies very quickly and i need something with plenty of battery because i hate being wired up all day, my budget is 1800-2000 bucks, what do you recommend, preferably not macbooks i had them in the past but i have seen more and more issues coming on the new models so i prefer to stay away also i would like to be able to upgrade it along the way if possible.
Thank you for your help.