I recommend, exploring other options. For example, work on same thing for 2-5 more years but from a remote location of your choosing, like Thailand, or full Nom

I recommend, exploring other options. For example, work on same thing for 2-5 more years but from a remote location of your choosing, like Thailand, or full Nomad life-style. If result improves your productivity, it may be a WIN-WIN solution.