I think I have a solution, though my girlfriend should get the credit. my apologies if this has already been proposed, but it's a long thread and I didn't read every post.
>>> turn on airplane mode. this seems to force photos to get the location from the sattelite network instead of the cell...