Maybe even consider the Lenova laptop for $800 that was recommended on the laptop thread and has caused the bruhaw about the wrong price.
http://shop.lenovo.com/ca/en/laptops...-series/y410p/
If you go on the NCIX site forum, these guys are often helpful in putting together a desktop. Just register and tell them your budget.
http://forums.ncix.com/