I think it got derailed. Angel drank the drugged blood earlier than Spike expected, as well as the counter effects from killing something. But he knows that Angel won't kill him and now that Xander is no longer a secret, there's no reason to hide.
Thank you. I wanted the progression out of dream to be smooth, so I'm pleased to know that worked.