I have no experience with infra-red film...zero. I am thinking about Ole,s remark inre: the 21mm Voigtlander. He states that the exreme depth of field helped a lot.
I wonder if this is so. If the focus shift happens at the film plane..depth of focus..then the shorter the focal length the more of a problem you would have. Stopping down of course would help.