Nice write up! Question about heat of vaporization and how it relates to power. You state that energy per volume is greater... Yes, but I am guessing that fuel will vaporize during the compression stroke once the intake valve is closed and thus no additional air added.
I think heat of vaporization is mainly part of the octane calculation cooling the mixture reducing detonation.