Improved Flamelet Modeling of Supersonic Combustion