One piece of advice for buying a new machine, don't skimp on the RAM. The stuff is cheap, get 16GB.
Isn't that crazy? back in the day the RAM was the expensive item while the GFX cards were fairly cheep. Now its like the other way around, RAM is the proverbial 'dime a dozen' while the GFX card is the money pit.
In all the variations of the new machine I would like to get someday the GFX card is like 40-50% of the overall cost of the machine. Last iteration I looked at rang in at roughly $2500, and the GFX card was ~$900 of that. and the processor was ~$1000. The memory 128gb was only like $250. way the world is I may never be able to afford an actual real NEW machine though.