If you like the car that much would you consider keeping it with the sunroof unplugged so it can’t open and just have the panoramic roof?
If motability would agree to that and that you could change at any time in the next 2 years without penalty if another car comes on the scheme… of course they may not want to if the car isn’t working as it should.