Bingo! When my wife saw the pics she said "THAT'S IT!!!" I must have seen the boat there myself without realizing what it was. Many thanks!
I have a second puzzler also. When I was in elementary school in Denmark - I believe this would have been in 1962 - 2 USN Fleet boats visited the port of my home town, Aarhus, and I went through one of them. I had started reading Jane's Fighting Ships at the time, and could see that one would be GUPPY I modernized, with the sail looking like the one on the USS Nautilus, and the other GUPPY II with the little cockpit and spray shield in the forward part of the sail. Which could those have been?
These boats were roomy compared to the small RDN submarines. I was on a 2-week ride on HDMS Nordkaperen in 1972, and all the food tasted like diesel! That was so incredibly cramped, with a regular crew of 22 and the an Army patrol of 5 with bulky "luggage" thrown in.