Actually your fork is perfect for that headset. You need clearance between the top of the fork and the inside top of the locknut, otherwise you won't be able to adjust the headset. Usually manufacturers allow 1mm clearance in their stack height calculation, another .6mm won't be an issue at all. Feel free to use any headset with a published stack height of 39mm or less. If you go taller, you'll have to eliminate a washer.
__________________
FB
Chain-L site
An ounce of diagnosis is worth a pound of cure.
Just because I'm tired of arguing, doesn't mean you're right.
“One accurate measurement is worth a thousand expert opinions” - Adm Grace Murray Hopper - USN
WARNING, I'm from New York. Thin skinned people should maintain safe distance.