I think if I was getting all those failed searches, I would probably do the same as you are doing. The bat is not that far away and a sure thing, whereas searching without a melee weapon could be bad. Once you have the bat, then you can try searching or even see if P3 would be willing to give up the pistol.