Showing those last pictures I believe someone has gotten confused & agjusted your timing screw thinking it was your idle screw? Never should be advanced that far. Motor should be around 19* at WOT. It also looks like the idle screw has been confused with the timing screw. It is backed off probably too far. Good compression numbers are critical on this motor, but if in doubt pull the head & look at cylinder condition?
The 4 wire VRO requires an addional harness #174710, but just gives you the purple wire with the pin & connector for the pump. The wire has a ring terminal & instruction sheet of how to convert pump. The purple wire provides consistent power for the warning horn. You may not be able to put the parts from your new pump into your old pump? Improve,nets were made in diaphragm designs & o-ring seals.