We lost a good machinist and mopar specific machine shop whe Dan Dvorak passed away a few years ago. He was located mid state in Waldo, so it was inconvenient for all, but worth the trip. Luckily I had kids going to college in Gainesville, so it was always a good excuse to see them too.
I am getting ready to head up north (vermont) for the summer, but if you have not done anything by the fall, I will be glad to help.
Make sure your sending unit has the grounding strap that jumps over the rubber hoses to the steel fuel lines