I agree...
After looking at the schematic for the PSK xceiver in QST I would also add that drift is a concern. With both stations "netted" you could become QRM to others.
I have also found that the IF-Shift to be of value despite my use of the stock SSB filter. I am encouraged to see that the 500hz filter is of value, and adding in use of IF-Shift, as you say, is about the best we can do.
The only other answer is the new Kenwood TS-2000 which is the FT-847 with a 2m/440 xceiver plus IF-DSP. It is the IF DSP that would make improvements in PSK. I can't give up SSB on 2M & 440 in hopes that AO-40 will eventually work in some manner.
Dick N3HKN