All sorted, very helpful lady from UK customer services looked at the PNR, the documents I had uploaded and agreed the letter recvd was incorrect. Not only should I have had Avios /TP for the original ticket but I should get the higher Avios / TP as I had paid for the upgrade. She then put me on hold while she spoke to the Exec club and came back on to tell me all fixed and should be in account in 7-10 days.