Here's the list of things I did last night:
Cleaned the ground on the bottom of the engine
Took the starter off
Cleaned the contacts on the starter
Opened the solenoid chamber on the starter, sprayed out the inside with carburetor cleaner (gave it ample time to air out)
Sanded the contacts a little to try to make better connection
Applied bulb grease to the contact ring in the solenoid
Clipped roughly 3/16" off the end of the solenoid spring
Reassembled everything
Applied bulb grease to the plastic connection to the solenoid on the top of the starter (generously)
Hopefully this does the trick, we will see.