That's a very illustrative google map, and I think reinforces my strategy. At the front of the crosswalk, in line with the bike lane paint, there is plenty of room for right turns, unless it's a humvee or bus or something.
Also, at the front of the crosswalk is maximum visibility of yourself to drivers parked at the light.