I purchased a Cooler Master 212 EVO and installed an additional Noctua NF-F12, both connected to the CPU header.
Idle temps are now 30C and temps while playing Overwatch and watching Twitch, 56C, 900RPM, and whisper quiet.
Looks like it was the pump after all, maybe coolant blockage or...