Sorry for the bedtime mess. I hate those.
If I get a short PM nap, an hour after waking and feeding, I will put DS into the car and go for a ride. He always falls asleep. I find even if it's just for a few minutes, it helps get him to bedtime without being so OT he can't even calm himself down without screaming for 30 minutes.
I know this is not a solution and it's major APOPing, but I can't deal with those horrible OT bedtimes. I have visions of me driving him for naps when he's 18. LOL.