bummer, I don't like the idea of leaving the diaphragm as point of failure, if you can't see a way to modify it to do everything it needs to do, replacement might be the only option. Plugging the prime circuit sounds easy enough but keeping the reserve and lower drain both working might be a challenge, do you have a local scrap yard? I'd be taking the tank and finding something that has an off.

did you get nice carbs
Pingel is still a good recommendation if you don't mind the cost and order process