Just ordered the parts. Everything is the same as the first post, except the memory which is the same as Bozo's Kingston.
This is the first CPU upgrade I have done since 2004, hopefully it will be easy to tell the difference.
Just realized I will have to reinstall, what a pain in the ass...