To me the main thing is to have the reholster be a deliberate careful act NOT an automatic twitch.
I talked to one gentleman who had reholstered after putting down 1 problem only to realize he had 2 more to put down. He got it done but said he really did not recommend a reflexive reholster.
Once I have deliberately decided to reholster. I clear a path with the off hand for the reholster. I bring my off hand back to the body and use it to: clear my closed front cover garment, feel for holster obstructions, shirt etc... I then reholster slowly and carefully. I only look if I feel something amiss.
I did this for years with Glocks and now with HK P30 LEM 9mms and HK45s. With the HKs I put my gun hand thumb on the hammer Before I contact my body. My emphasis is on doing this by feel is because I do not assume I will have light. I do feel better about a hammer pistol in this situation especially in the dark under rain gear, multiple layers and/or other equipment.