You can go either way and shouldn’t have problems, as long as you don't over lube and attract crap in the extension.
If you think that the buffer/spring is causing you problems, just pull them and check them out. You might have to clean up the edges on the spring is you are getting scraping marks. Just use a file to clean up the end cut if you have a bur sticking out and doing damage to the tube.
On the buffer, you may want to straight file the buffer roll pin is it's sticking out and catching the spring when the buffer comes back.
The one thing that I should add is if you have having problems with the rifle, and your using a new stronger recoil spring (like a extra power), you may want to just find a old spring until the rifle breaks in, then drop in the stronger spring.
Clipping a few winds off the spring should never be an option, nor desired.
P.S. I'm in Palm Beach until the end of the month. If you’re close, and what to get together for me to look at the rifle, drop me an I.M. I could use the time off from golfing and get some trigger time in, instead of spending my weekends at local courses sweating my ass off.