Did the swap out over the weekend using Brandon's wiring info and it works great! A couple of the wire colors were different than what is listed, but I just used the connector numbers and everything works perfect!
Had to run a new wire for the tach and I wound up connecting it directly to the back of the circuit board where the screw is because I couldn't find a source for the extra connector I needed for the plug.
Good job, Brandon