Okay, first of all, the d20wiki site is cool. I hope that it keeps growing. Now that that's said, looks like we handled the waking up due to battle fairly well the last time we were attacked during a sleeping period:
http://www.d20wiki.com/index.php/Waking_Up_Sleeping_PCs :D
Nice find
It worked very well from my point of view.