One of my earliest memories is seeing those 2 submarines - definitely Andrew and Rorqual. I have a picture in a book with both subs there in June 1977. Andrew was the last RN submarine to have a gun mounted and the last to be in service that was designed during WWII. It was also used in the 'Warship' TV series (as a German sub). I was really into all this stuff as a kid and have had to retrieve some of my old books about ships on at least 1 occasion from the wife's "disposal" pile!