Are you flying your upwind leg directly over the runway? That's one thing my instructor insists on, that the upwind leg is right down the center of the runway. Usually isn't a problem, because if someone is taking off they wait untill your're on the upwind to roll. Of course, you could just find somewhere to fly with a wider runway....

Andy