Don't shorten your hose. A lot of lawns need the extra length.
If that D-30 pump looks repairable to you--(with a new pressure relief valve) make him an offer. They are expensive new. Too much pump is easier to deal with than too little. Your calibration method should work fine. Except that on grass you will find yourself walking a little bit slower than walking on concrete.