Yes #1 you are correct about the PH!!
To prepare a proper freshwater dip, take either dechlorinated tap water or demineralized water (RO or DI), aerate for an hour to maximize dissolved oxygen, heat to match the temperature of the dip water to that of the tank water, and then add buffering...