Alright, I've finally got my specs set in stone.
The benches of the 670 at 2560 convinced me to go $100 over budget. Hopefully it just means I can go an extra year or two without upgrading the GPU, and do that when I do a full system upgrade.
Just buying everything in stages as money comes in, probably going to be a week or three until I'll actually be building :(