I need to get pics of the ignition set, it's a nice one from live wire. I didn't have time to pull the plugs and re-gap them, but with this setup you can supposedly gap them 0.060. With the stock gaps it already runs smoother.
The reason for the water pump change, the lousy bearing was failing. It would chirp on cold starts and then quiet down once warmed up. I didn't want it failing and causing all kinds of damage. I decided to get a #42004 from napa, the bearing felt perfect, although when swapping over the heater hose tube to the new pump, the old pump's bearing felt like the new one, and there wasn't any slop. On initial startup the bearing chirped like the old one did. I thought I had done the work for no reason, perhaps it was the alternator bearing chirping. Let it warm up with heater on hot, and once it got to 200 I turned it off to let the system draw in coolant from the overflow bottle. Yesterday when I started it, no chirping, just a little belt squeal, but I had got the belt wet with water. The belt squeal was short lived, and now I have normal sounding jeep on cold starts, and it seems to run a little better with the hotter ignition.