My front tire is getting a little bit of scalloping so perhaps it is causing some of it.
Bingo! This happens quite often on these bikes, and is really nothing to worry about.
And yes, a fork oil change is a good idea. But, if you'll be doing the bushings soon, you might want to wait until then since you'll end up having to change it again then.