Well, lots has happened since this.
I found out my starter was all but dead, the bendix was not engaging and going up.
Also I had a rectifier that one of the cables had basically corroded off, a simple pull broke the one or two remaining strands.
also i did test that choke solenoid and it did...