What would make you happy is based on what you intend to do, and, how much money you want to spend. We don't have that information yet. Primary would be for you to disclose the reason you feel it's necessary to upgrade the machine.
It's a bit like asking "What's the best car to buy?" If you're single it could be a sports car. If you're a hunter or hiker it could be a off-road SUV. If you're a construction worker or home rehabber it could be a pickup truck. If you're a soccer mom/dad it could be a mini van (are you beginning to get the picture?) Any and all of these would be best for the situations I've described, but make the other people very dissatisfied.
If this Answer is helpful please remember to return and mark it Accepted.