Well I finished my watercooled head. And yes it fixed my heat creep problem. Also, yes I have an air gap between the heaterblock and the heat sink.

I posted a video on youtube.
https://www.youtube.com/watch?v=R_iI9cz2egM&t=144s

I really like the water cooled head. It has really helped with head getting up into my cold end.

Eric