What would you do?

Probably yes to both your suggestions, but how about also ;
Sniper fuel injection? Not so much for power, or even better mileage, but better drivability in different temperatures and altitudes.
Distributorless ignition?
Overdrive?