Hi,

Sorry for the delay, I've been a bit busy for the last couple of
weeks. The code that Martin provided worked perfectly, and solves the
issue! I removed a few unneeded lines (`window-next-buffers' need not be
modified, as it is not used when setting point) and wrapped it so it
only runs when `switch-to-buffer-preserve-window-point' is set, and
created a patch, which is attached. 

Let me know if you think another approach is better or if there are
other issues with the patch that I can help resolve.

Thanks,
-Jay