So, is your electrical stuff working now? Inquiring minds want to know!
The warm starter sounds like a problem.
Make sure your connections are clean. The connection in your second pic looks like it could use a good going over. I use emery cloth to sand off any corrosion then coat all surfaces with dielectric grease (available at Home Depot/Lowes in the electrical dept). The grease keeps the connection from corroding again.