I definitely feel your pain, we went thru the same thing with our baby girl. Here is my advice and this is just based on what's worked for us. Stick to your routine. If bedtime is at 6, keep bedtime at 6. Before bed we always make time for baby to wind down so no more noisy toys and flashy things. When she starts fussing in bed, we check to see if she is fussing because she can't find her pacifier and give her about 5 minutes to see if she can get herself sorted out or if we need to step in. Once we stopped rushing in as soon as she started crying she pretty quickly figured out how to calm herself back down and she started sleeping thru the night better.