Glad the tap is working out for you... Do you think the shop you purchased from will swap the shank out? It may be worth a shot.