Hi,
I think the EW was probably due to OT. In my experience cutting out the CN can be a tricky business. With Brodie, when he got to 3 hours A it wasn't consistent....especially that 2nd A of the day. Sometimes he would manage 3 hours, sometimes only 2 hours 45. In which case I would throw in a tiny CN of even 20 mins to get him through to bedtime without the OT monster creeping in for a visit. I personally would not cut the AM nap.
You are doing a fab job, EW's are awful so hugs on that front but you get there in the end. It will just take your LO a wee whiley to adjust.