Yeah Do all of the above, you may want to pull the starter out and file down the metal where the starter mounts to the Bellhousing, take a wire brush to the Positive Terminal on the Solenoid and all of the other wire connections, if it is not a bad starter, it sounds like a Poor connection somewhere.
All of the above are great suggestions too!
All of the above are great suggestions too!