Sounds like you are making progress. I've sort of lost track. Be sure you read the MAD article, and if you do nothing else, inspect and repair the bulkhead/ firewall connector
If all "seems working" When you get it running and sorted out, warm it up and check the battery running (charging) voltage