That 5.8 is your problem. At most make sure water going in has proper pH. Run off pH will not give you the proper pH of the soil. Testing run off can be misleading.
I would do as already stated. Get a container with four times the amount of water to soil, pH it and flush.
A proper soil will buffer pH. Just make sure the water you are putting in is not one extreme or the other.
