Track progress without remaining estimate

We have too many stories and usually these stories are created time by time. We want to mantain on portfolio only epic (and actually this is working) and track progress at story level.
The main problem here is that during "update from date" procedure, the progress is calculated adding time spent connected to epic and remaining estimate.
We want to give the user (portfolio edit permission) the capability to decide how progress is tracked, not only with time tracking but with 2 more setting like:

• sum time tracked
• sum remaining estimate.

this can help solve different situation that we are facind in different project and application of portfolio