Here's a dirty quick-fix for the GPS offset:

Pick a zoom level that you use most often and draw or stick a little dot on the screen (nothing too permanent) of your true location.

It'll only work at that zoom level, but it's better than nothing!