I think we should keep track of both, if possible.  For different goals, as you note.  Testing the Hubbert model vs. keeping an eye on what really matters in a practical sense.
I second that.
and a 3rd...