Thanks for the detailed description.
Note that allowing via points and shaping points to have the same weight in rerouting,
then nearest / next waypoint (also in strict) will be any of both: a via or shaping point.
Navigation panels will show distance and time to next any of via or shaping points.
And top-left nav panel will show direction / distance to any of via or shaping points.
There cannot be half solutions in rerouting vs UI, any change will affect all of them.