I know a retired nuke submariner very well. He says modern subs are luxurious compared to U-boats in Das Boot, but feeling is 100% true even today. You can make a sub more spacious, but that won’t make it less claustrophobic.