I would just keep resettling too. I found that ds would need resettling for a bit then he would just find his own pattern and sleep longer. Some days though if he wakes grumpy and its only been under an hour, i still resettle but its very rare. DOnt shorten the day sleep in hope for abetter night sleep - imo, it doesnt work. I find that good day sleep = good night sleep. FWIW - ds still wakes up around midnight and needs one of us to go in and give him a shhhh and a pat - then he is fine and sleeps till morning.