PB Blaster is your friend, spray everything a few times and give it a chance to work, like a week or more. You have room to reindex, but if you want to upgrade now would be the time.