Becky - cute pic of S!!! So you finally got the fab pm naps with the short AM nap then?!!! IMHO I think the AM nap may still be a little early. Have you tried AM nap starting no earlier than 9.30 - or how about cutting it even slightly shorter still to 15-20mins?
We found we were STILL getting EW with the 20min AM nap from 10-10.20 & 2hr nap from 12.30-2.30, BT at 7pm. So we've gone back to long AM short PM & except for today, our WU has improved quite a bit. We are down from 2h 20 total day sleep to just 2hrs now though. So maybe with the 30min AM nap its just too much day sleep?
It does make me wonder if all your NW's might be discomfort related though - is he still gassy/refluxy or teething

Or do you think still related to the boob

When O is OT we often get a few WU's in the early part of the night & of course the EW's, but NEVER get WU's like that, so I'm not sure its entirely down to that.
Ladies - I stuck with the 35min CN & 7pm BT. We'll see if we get another 5.30am WU tomorrow. I'm hoping not but have a sneaking suspicion we might. We've had a lot of stirrings/cries out this evening so I think he's actually getting rather OT. Yesterday he only slept a total of 12 hrs (naps + night sleep

)