I may be missing something but the OP is suggesting to lose £400 deposit to change to a flight costing €100 each more and a downgrade from F to J with a longer routing via Doha? Simply to avoid changing from T5 to T3?
Doesn't work for me I'm afraid. Stick with it, travel F and have time to enjoy the lounges in T3 which are probably the best at LHR.