Australian A330MRTT will have pax, freight and tanker capability, including a flyable boom. No extra tanks needed.
Useful for not only our pointy-jets, but also those of our NATO allies who are often, nay, always the first to squeal for more AAR when Mad George has another war.
Might I suggest (after $hitcanning PFI):
10 x A330MRTT (identical to the RAAF aircraft with 2 hoses and a boom)
6 x KA330F (full freight with 3 hoses)
2 x A330-200 (VIP or pax)
That's 10 x A330C1K, 6 x A330KC2 and 2 x A330CC3
......and an old Varsity off the Catterick fire dump for Bliar, Brown and Browne....