The diagram is almost correct - first, the wires that you have labeled "to ground?" (connected to terminal 85 on all the relays) should also go to ground through a nice, thick wire so that the voltage from flipping any of the switches has somewhere to go. Also, it looks like you're missing that wire on the pass side "up" relay.
Second - I'd fuse the 12V wire going to the relays on pin 87 for 30 amps or so, just in case you get a short (especially running new wire through the flexible link to the doors).
Third - I'd run 12V to the pass side relays from the same un-switched source as the driver's side relay. This requires running a new wire to the relays, but the way you have it drawn now, the 12V switch on the driver's panel would prevent ANY of the switches from actuating that window, not just the passenger's switch. Again, make sure this new wire is coming from the fused source.
Fourth - The connection from 87A is going to ground, right? Make sure that's a nice thick wire running back to the main chassis or battery, not just going to the door frame. The door frame is very poorly grounded, especially when running significant current through it (like the window motors draw)