Yes. You're probably right. That shaft / hub system is still a mystery to me, since i've not taken one apart before. I'll fix the bearings and see what sorts of noises I have left over!