JMHO, but I don't think the factory engineers imagined people would be running the cars at factory timing using 91 octane fuel in hot conditions! Retard that baby...
Other suggestions? - full standalone engine management with knock sensors.
Is anyone else with your engine in the same climate having the same problem? When you say lean to rich running conditions, where is it lean, where is it rich?