One minor thing to keep in mind is that by extending an extra year or two might affect the good condition “bonus” you get back by about £100 or so.
I am in the same situation and have called motability about this and they have confirmed on two occasions that you can get another car anytime during the extended lease.