All great advice, and I'm reluctant to throw my 2 cents out with your avg and tier a notch above mine.
Obviously note taking and club mapping are key. The basic rule of thumb is uphill divide the elevation by 3 and add to the distance. This will get you in the ball park. Downhill, divide the drop elevation by 4 and subtract from the distance. Can't go wrong with the downhill formula.
Right, wrong or indifferent, here is my formula for uphill shots. It gets me closer than dividing by three, and since using this formula my "Avg. Distance to the Pin" has dropped below 11', and I'm starting to suffer from "hitting the pin ricochet syndrome".
Elevation divided by the distance. The percentage you get is then subtracted from half the elevation. Add that to the distance. Aim and ding the meter. This formula is only good for half backspin and no backspin with wedges!
Edit: This formula works with my ball/club combination, but could be a decent starting point for you if you are interested in changing up a few things.