Looking around, I decided to purchase the Thermalright Phantom Spirit which is the successor to the Peerless Assasin.
Couldn't say no at £30 considering it outperforms the Noctua NH-D15 in certain scenarios!
Managed to sell my 5800X and the cooler for £130 so all in all the whole upgrade cost...