For some reason I thought episode 24 wasn't until next week, but let me just say that for me that moment of Light getting the death note back is probably one of my favorite scenes in the series, it's just so freaking awesome!!!
Love seeing you being this much into the series. By the way, the other fake rule Light added was that if the death note is destroyed, everyone who has touched it would die along with it. With that in mind I think we can safely assume that Light did expect several people within the task force to touch the notebook.
I also think it's cool to consider Light's personality pre/post death note. What we've seen of him the last few episodes should pretty much equate to what he was like before the series began. And now he's like this :'D
Also fun fact: That moment of him getting the book back spawned a certain meme about fansubs. Long story short, a fansub translated Light's catchphrase of "Keikaku Doori"/"All according to plan" into "All according to keikaku" with a Translator's note at the top of the screen saying "Keikaku means plan". #themoreyouknow