Get an older Dell XPS 15. Newer gen are above this price point but 2-3 gen back will be very nice.

Battery, WiFi chip, memory, and storage are all upgradeable; you'll just be signing up for a given chip generation. L