First off, welcome to GMSB!
As to your question, I'm no master mechanic either by any means. But if you have the money, I would get a new distributor. The bushings can get worn in old ones and cause all sorts of grief. Not to mention that by the time you replace all the internals, you'll be...