nilak, IFF I were stuck in your shoes (big if), I'd start by:
a. calibrating the spark map using 87 octane instead of 91 or 93
b. NOT using WOT-PE below, say, 2750RpM
c. under-utilizing WOT-PE from 2875-4000RpM
d. saving for a smaller cam, if not a smaller crank or engine (whichever happens to turn out cheapest)