Whatever you do, get the headtube faced.
I love Intense, but if your headset's not sitting correctly you might be a victim of Intense's notorious quality control.
Assuming the headset cups were pressed in properly, of course.
If you go Chris King, make sure you get a facing, anyway - they...