Correct on all counts Chris
The original RAF variant has type number 1106, but was relabeled to a type 1180 when converted for inflight refuelling. Starting with the Ghana Airways type 1102s, the wing basically stayed the same for both the newer Standards and the Supers, apart from a different configuration of outboard fences and some small changes to the leading edge next to the fuselage.