Are you just using McGrath to get over the railroad tracks? If so, you could go up Hampshire as far as Columbia, then take Columbia/Willow into Union Square.

OTOH, I've taken McGrath that way a few times, and other than the traffic smell, it's not that bad. They can see you well coming up the bridge, and on the other side you've got enough momentum to just merge at the same speed as the cars.