I think upgrading these heatsinks would be an easy upgrade. At the very minimum you could run a copper base plate underneath the existing heatsinks.