"Newegg", as suggested by HK, is supposed to be a reputable site Jaggy, but I do not know (or can't remember) where you live, so I cannot be of much assistance in regards to potential sources. That said, your choice of components seems fine and will offer you a dramatic improvement.

Taw - Bah! Keep running that joke into the ground if you wish. My future PC will put you in your place, you foul rabbit torturer! Just you wait...