Yes and also yes to changing the ignition map tp scale to match the fuel.
So lets say at wot you are hitting the 45 tp column. Make the 45 column your last high load/furthest to the right column and start blending or interpolate the rest.
Remember, the scale is effected by the k-value: high k-value shift the scale to the right, low k-value to left.