Well, the Salmon's substantial increase tells me that yes, Porpoise would have had a lower range. Excellent!
The only source on the S-class that I can find indicates 20 hours at 5kt = 100 miles. Seems way excessive (almost a third more than a fleet boat!) but I have no source to go by.
Otherwise I took the rest from the table cited here as I consider the fleet boat manual to be as good a source as I can get
Looking good! I think you'll be happy with my fix.