I just wanted to add, sometimes my ds gives tired signs straight after an evening feed...kind of like that sleepy feeling after a big meal. so given he is having good day sleeps, you might try say 1/2 hour of quiet story time & cuddles to bring bedtime a bit later.
I too have been through stages of dreading bedtime with both boys, the thing is if it isn't working give it a few days with the method as if you change it too often they get confused.
Another thought I just had with my ds#1 we had a "horror week" around 6mo he just wouldn't go to sleep... I bf & in the end I offered a bottle of formula (on the 5th night) after the bf & he dropped his 10pm feed (he always woke for it) from that day on... so I ended up giving him a bf, then solids, then bf between 5pm & 7.30pm & he slept through until 6.30am. He just wanted to be tanked up for the night. So maybe try giving a bottle after the catnap, then solids, then delaying the 6pm bottle a bit...just a thought