I've been doing the same mate Asus are really on top at the moment decent ram and graphics cards
I would look at streching the budget to about 1.2K and you should have everything you need as for HP they plan on selling there retail arm so not sure when the support will be over, but gratis to them they are well spec systems for money!