OK, I resoldered the feedback resistors in. With the higher B+ the waveforms look better bit still flattened off quite a bit over 2.8V PP.
Interestingly, the waveform looks much better after the first stage than after the second. Could the feedback circuit be causing this?
Blue trace is after...