I had the same issue in the past. Thankfully I was with AAISP who was willing to fight for me.
Openreach did the following:
* Lift & shift
* New line from house to pole
* New master socket.
And it was resolved.
So I would suggest that you tell your ISP to pull their finger out and resolve it.