Had a good play around with the core, memory and voltages last night.
It seemed I could up the core to about 1000 and memory to about 1450, and up the voltage to about 1050 and heaven benchmark was fine. Running Heaven on my default settings (800, 1250) got about 45FPS, on last nights settings...