If you are concerned about the extra charges for going through LHR, you might want to see whether you can go via MAD on IB, since you can use your Avios with them too. Just ensure that if you do want to swop airlines you are really clear about any cancellation charges from BA. If I am reading your post correctly, since they have made a change you should be able to get everything back from BA. But you need to check.