The idle issue could be anything from a bad TPS calibration to an air leak.

Disconnect the idle control valve and see what happens.

I wouldn't replace the fuel pump if it's working, it seems pointless, a filter change is a good idea though.

Yes, rewiring is a good idea (along with the fans) and the said MSD (amongst others) sell looms.

In the case of the pump, the existing relay becomes a trigger for the new loom.

Martin