I think ur right on both counts. At least until this Sue Gray report. If that criticises him strongly then I think he'll lose support and face s challenge.
Long term the longer he stays in it turns into a positive slowly, as he becomes 'strong, resilient, powerful,' etc and has 2-3 years to turn polls round with a successful economy and all the rest
Really critical week coming.