oil light flickering at high rpm

You know, maybe the little idiot light sensor you have just can't handle the higher pressures your throwing at it and it's spitting the dummy and flashing the light. You should consider that.