We have been going through similar issues for the last few months and DD is drooling an awful lot lately. Plus she has been sick a lot in that period. It is so hard to cope with though. Definitely go for the mattress on the floor. We have had the mattress on the floor for quite a while and makes it much safer. Even though DD still head butts the wall in her sleep it does not wake her

I tried the NCSS and it did not go so well for us. I think like one of the PP said, some babies respond this way to developmental changes. I am just riding it out with the belief that she will get better at sleeping longer herself. Last night I was only woken 4 times which was AMAZING.

Fingers crossed for tonight for you.