That sucks. It seems weird that two heads in a row would have been faulty.
The only suggestion I have, which maybe you already tried, is to put a thin shim of some kind between the battery carrier and the tailcap. Some people had problems with the battery carrier not being pressed into good contact with the head.