Hi Rick,
You mention Armadillo, by coincidence I just looked at this listing, which has 15 mentions of HMS ARMADILLO, often with a Naval Beach Commando association
eg
1504 F Naval Beach Commando BC with Force S - *? - Portsmouth 04.44/Normandy 07.44/UK 08.44/ARMADILLO 08.44/LIZARD 09.44?.*
LIZARD 10.44 ? 12.44/Naval Party 4003 by 01.45
http://www.naval-history.net/xBW-RNNavalParties.htm