Capt W,
The early Whirlwinds (HAR 1 & 3) had the Wasp, the later HAR 5 and HAS 7 had the Alvis. Many of the later HAS 7s, which I believe didn't spend long in the AS role 'cos the Wessex arrived, were converted to HAR 9s (Series 3, with the Gnome).
I now claim my sad spotter's badge Grade 3, and retire for the night (packing all these boxes has done my back in...).
Cheers,
Thud