R2 Carb, Fuel Pump and Fuel Questions

Wanted to see if I could get some advice on a 1940 R2. Trying to get her running again after 8 years of being dormant and problems trace back to fuel delivery. I figured it would be a good time to go over the carb and fuel pump completely as well as flush the tank and lines. Does anyone have good information or a source for carb parts? The carb is a Zenith K5A, model 8893A (5B7945). I spoke to Zenith and they suggested a K2097 kit, but it has the wrong needle valve and that I would need needle valve C81-3-62. They also suggested gasket set C181-4 which has some of the same gaskets as the K-2097 kit, but not all. I don't mind buying multiple parts or kits, but I would have thought that there would be a distinct and complete repair kit for this model. Zeinith suggested either V.E. Petersen or Cleveland Ignition as two sorces local to me (Western PA) for parts. Any advice on fuel pump diaphragm and related parts? The fuel pump is an AC 1622315 (maybe 1522315, hard to tell), the manual lists a 4B8432. Any advice on fuel? I had previously ran standard 87 octane gas with an off the shelf lead substitute. I've heard of people running AV gas which I heard contains lead but running the higher octane gas concerns me because of the low compression. Any advice or direction would be appreciated.

My old R2 could be started on gas and then switched over to kerosene. the gas tank had 2 compartments and valves on each line to change over, although i just used 87 gas.sd
I had a real difficult time trying to find any parts for the fuel pump--if i remember right i had to epoxy a crack on the fuel pump housing and found a similar oversize diaphragm and cut it to fit.
my parts book shows ac 1522345 as the diaphragm assembly---I had 6J102 R2.