If you already got Baxi coming out then you might as well wait until he comes and having seen the problem can give you better advice then any of us. If its not covered as part of the warranty, but maybe he has one on the van, then maybe you might be able to "convince" him to fit one
Obvioulsy that doesn't solve your long term issues with system debris but it will get you out of a fix mean time