If the locknut won't thread down far enough, put a spacer under it to adjust the engagement. I would not cut the steerer down to exactly match your current headset unless you are absolutely certain you will never replace it with one with a taller stack height.