Have you considered water/alcohol injection for the octane issue? A system may cost $400 USD; it appears that it may pay for itself and be much more convenient. The new computer-controlled systems should be much more effective than the old "windshield washer pump" versions.
It is sad that engines only need the octane during high torque and large throttle openings. The rest of the time the octane requirements are much lower.