I'm probably not best placed to give any advice.... but...
Duvet coming off - can you put him back in a sleeping bag? Or in one of those wadded walk in sleep suits? I assume he's got one of those stay put Gro company duvets, but if he's crawling out, he's definitely going to wake up cold, yk?
Also I think (I know it is a pain) that you HAVE to let him get from moaning to crying and then you HAVE to just stay with him while he settles himself. He's not going to learn to do whatever (back up so his head isn't in the bars, etc) if you do it for him. It will be a painful few nights, and I know it is extra specially hard to do it when you know you could get back to bed in a few minutes if you just tucked him in etc. Once a night retuck might be OK but it's getting a bit much really now?
Re the EW, can you try pushing his nap back just a bit? I don't think I'd cap it, at least not to begin, but maybe make it 12.30-12.45, but keep bedtime the same, and see what happens?