Typical Valve, this is brilliant. My friend thought it was for Portal 2, but your theories make more sense.

My own info on Episode 3 is much more limited, but there is a new weapon, and a potential act structure. Which is probably gone now, because it was on a whiteboard.