If you move the tank and switch 30 ft higher, and reduce the switch settings by 13 psi (30 ft/2.31 = 13 psi), then you will have virtually the same conditions that you now have with the following small variations:
1. You will eliminate the pressure loss that now exists from tank to user when you have high flows.
2. There will be a virtually unmeasurable increase in pressure at the pump at the shutoff point due to the pressure loss in the pipe as it is filling the tank. That pressure loss will be small because the pump is pumping at its lowest flow rate as it approaches shutoff pressure.
If the pump has some pressure margin then you can select a pressure setting between the existing setting and the "13 psi lower" setting.
If you are using surface water for drinking it should be filtered and disinfected. You may not have a problem because you are accustomed to the biological thingies that are often in surface waters, such as cryptosporidium, giardia, and coliform bacteria. However, your guests might be susceptible to those things.
If you want to find out about crypto, Google cryprosporidium milwaukee and cryptosporidium seneca lake