best-game We already have some margin built-in that it should be reached slightly before end of the window, but this assumes a fairly proportional charging curve, and clearly this is heavily dependent on your system and battery state and target SOC. The closer to 100% you get, the longer it will take because the charge rate will get ramped down.
You could try and adjust your battery rate to 2.9 or 2.8 or so and see how you go.
We might make a correction factor available in the Advanced settings so users can apply this to the 'adjusted' charge rate.