So did you find out if you have hard water or soft water? When you measure PH, you should put your tap water in a cup and water 24 hours before measuring it. It's not uncommon for it to go up.
If your water has ammonia, then it has chloramines. You need to use a water conditioner that removes chloramines and ammonia.