In regards to what was in his room....
Spoiler:
I watched it again and I have been thinking about it. Could it possibly be whoever is in the astronaut suit? This hinges on the assumption that the thing he fears the most is his own death, of course, but I think it could work. He looks into the room and says something like "Oh, of course it is you." (forgive me if it is off...I can't listen to it right now and am going off of memory) and then when he is at Lake Silencio, he recognizes the person in the suit again. This could explain how he knows them. Just a thought.....


Also, they have officially announced the schedule for the next two seasons: after Christmas 2011, there will be an Easter 2012 special, series 7 part one will air in autumn 2012, followed by Christmas 2012 special, series 7 part 2 will air in spring 2013, and all of series 8 will air in autumn 2013. Sounds like 2012 will be a bit bare...but 2013 will be absolutely full of Who! I'm excited