Unless there is some legal reason why the passport must be changed, do not make the change until after your return. Then the ticket and passport are in the same name, there is no additional work and nothing to go wrong.

Additionally, while BA will do this for you, if for any reason your ticket involves flights operated by another carrier, that carrier may not change tickets or may not do so through any organized means.