I watched my tape again and discovered my first room was horrible.
I cut the cinema a few seconds in, after she's rolled and the camera shows the guys standing near the door. I got one CMP from this room, and picked it up late, too. I had already switched to mines. So I switched back and killed the guy near the switch for more ammo (26 shots now). 2nd room was okay. I killed those two guards like normal, the patrolling one was way over near the far door, so I killed him first. I do the buttons and everything just like you now, doing it all in left strafe is too hard because you swing out underneath the ramp and get stuck after the 3rd switch.