What have you tuned advance by? MBT? If, so I would not vary off MBT tune w/o alky/water until the other parameters were correct (i.e. enough alky is being injected based on your engine, NO knock, etc...) Oh, and I actually saw you were using an M12 (pays to read, eh!). To me, that seems on...