I loved this sequence when I first read it.  I felt it perhaps needed a bit of re-ordeing and a tad more kinetic energy.  So I added the motorized stairs as a fun way to showcase this final showdown between Guy-Am-I and Pam-I-Am.  It really punctuated the tension, resulting in a fun fighting sequence.  I too it as far as I could, culminating in the escalator neutralizing Guy.