I'd keep it for a week or 2 and see what happens but then for us it was capping to an hour from 1.30-2.30 but DS was evil when woke. So it soon became an out an about 40 min CN then no nap.
Oh my poor u that's horrific, I forget those long NW, is it teeth?
x