I think you have already made up your mind, am I right?

Well regarding the delays I was thinking more about the return as well as the EDI-AMS.
No, what you are doing is okay don't get me wrong just wondering if it is worth it that's all unless you are going for status with BA.You shall be able to enjoy the facilities in Terminal 5 as well which is a bonus.
Go for it.^