I was also thinking that the condition you stated above (poor ignition wire connection at fuse block connector) may have also been contributing to your rough/poor idle when the engine was hot.One issue I had and didn't mention is yesterday before I went for a drive I started the car and pulled it out of the garage. Was letting it warm up and after a couple of minutes it died and wouldn't restart. Engine would turn over but no power to coil. I removed fuse block connection from engine side of firewall and had power there but not beyond the firewall. Wire had continuity from coil to connector. Cleaned the connection and plugged it back in and it started. The wire connection looks suspect.
Be sure all of the wire connectors are clean, corrosion free, and tightly fastened to the wires.