A interesting report! I had long believed that the machine used in the '999' episode was XP354 which was a Whirlwind HAR.10 used by Brian Austen as a spares ship. It vanshed years ago. It's worth pointing out that Whirlwind parts were swapped around quite a lot on machines even in service.
Is the machine at a diving pit?