And after the second cap the 3V3 spikes are massively reduced and the output ripple is down to 286 mV p-p.
I think that's it for tonight as it's getting late. Tomorrow I'll see about adding some back side caps and see if I can cut these spikes down even further.
Clearly on the right track, though.