but I'm always worried about leaks.
Leaks from what? The pump. If so, I would simply replace it or at least do some maintenance on it. It's is pretty old.
These days, I have been using the Optimus Nova) (not the Nova + version) over my MSR Dragonfly, although I will take the latter with me on shorter trips where I need to carry less gear. (The Dragonfly is a but bulkier.) The Nova has a great, metal pump that is very sturdy. However, my cooking is more elaborate that that of many others, so stove likes those may be overkill for you.
32 oz. White Gas or Crown Camp Fuel cans can be hard to find in places. As noted, you can simply donate what you don't use. I did that in WY, when I had to buy a gallon of Coleman Fuel. Left what I didn't need at the campground for other cyclists riding the TransAm. I have, however, found the smaller cans. REI seems to always have them, and I remember finding them in independent sporting goods stores in Whitefish, MT, Winthrop, WA and Montrose, CO. There is even a store in downtown Philadelphia that stocks them during the spring/summer season.
Back in 2000 I spent 7 weeks touring Andalucía with a burner for a Gaz canisters. Didn't like it at all. The canisters didn't last long for my type of cooking.