I had 8+ years of great service from my original BB supplier. After several takeovers of the original company I ended up with Opal (part of TalkTalk I think) as my supplier. After a month or two my up to 8Mbps service dropped to an inconsistent 0.5Mbps. After several weeks of Opal blaming BT and vice versa and finding it almost impossible to get through on the telephone to Opal I changed to BT and signed for Infinity.
My reasoning was two fold. Firstly, if I had problems then in theory I only had one company to deal with albeit possibly separate departments! Secondly, BT Infinity entails an engineer visiting to change the master socket and install the new vModem before then checking a satisfactory speed.
With that in mind if you do go for Infinity the engineer will immediately spot if you have a line problem. In my mind your choice is clear.