Also, you didn't mention a monitor. If you go with a desktop, a good IPS panel display can go a long way when it comes to your post processing. I've been eyeballing Asus's 24" ProArt monitor for a long time now.