So the new CPU and GPU I bought arrived, but it turns out I need a new PSU to use the GPU. Great. Oh well, it'll be here tomorrow or the day after tomorrow.
Regardless:

CPU: AMD FX-8120 (would get FX-8350 but it wasn't compatible with my motherboard)
GPU: AMD Radeon HD 7870
just to put that into perspective, here's what the desktop I bought these for was using beforehand
CPU: some dual core 0.25 GHz CPU I don't remember the name of
GPU: NVidia GeForce 9500 GT