Hi, I'm flying to IAD tomorrow, returning back to LHR on 7th Oct but via BWI. I wanted to upgrade the return flight to business. I have a few options here.

Current flight is - ba228 (787-8)
Available options are :

1) stick with the above - current upgrade price - £1330
2) change to flying out of dulles on the same date where I have 2 options
2a) ba292 (a380) - would have to call to get the price
2b) ba216 (a350) - would have to call to get the price but if I try a prospective booking this one is looking super expensive.

I don't have free changes so anything I do probably includes the £50 change fee.

My query is:

1) is the concensus still to wait till after I've flown the first leg before making ANY changes?
2) is it even worth changing? Only the a350 has club suites but I think that flight is looking much more expensive. However I don't know if that's because I'm looking now before flying the first leg.
3) is it worth changing from the current 787-8 to the a380 for business if the prices are the same. The only problem would be arriving in London at 11am vs 9am


Hope all that makes sense! Thanks in advance.