No nap. We do 20 min of TV at 7, when I put baby to bed. Consistent routine every night. Bath, banana/milk, 1 story, brush teeth, 2nd story. 5 min cuddle in bed, lights out with music on. if DS gets up, we march him back to bed.
also, we run the crap out of him---he goes to the park/outside time 2x a day, rain or shine. lots of activity, but winding down at night. good luck.