Little bit more theorising - no, just guessing. No spoilers.

[AmanitaMuscaria]

No: HPFGUIDX 172151

Haven't read any spoilers, don't want to, you won't find any here.
Just a couple of things - the idea that the Hogwarts houses need to be 
dumped to create a unified stance against Voldemort: the easiest way to 
bring this about is, as was done in PoA, with the whole school, 
probably somewhat reduced, brought to the Great Hall for lights out. 
After a while, I could see the House rivalries breaking down as people 
want information. As for the problem of everyone being in together, 
well, I'd guess magic could sort out some privacy.
I'm also hoping the shower of Grawp's blood that Harry and Hermione had 
in OotP will come back as some sort of added protection for them. I 
didn't think he would, but maybe that means Ron gets it? B£"$%^ - that 
might explain JKR's tears - Ron was modelled after her best friend.
The insomnia thing is strange - I wonder how many others are having it 
in the run-up to DH? I didn't get it before with the other books.
I'm loving every last moment before the big reveal.
Cheers, AmanitaMuscaria