That all sounds right, except that you should have a Brown wire at 4 and 5. 4 is ground for the LF window, 5 is ground for the rear window safety switch.

While we are at it, 3 is supply from fuse B, 1 and 2 supply voltage or ground from the switch to motor, depending on switch position. 6 is power for the switch light (LED.)