I'm having a hard time understanding the problem. Is autofocus involved? I'd just send the camera and lenses back to Canon for adjustment with a good explanation of your problems. Unless you're worried about shipping costs or time without your camera better to do it now and get it over with.