banjo-
You say "would have put me just beyond the no-deco limit". I *know* that most divers, and most of the dive industry, did not know how to use the USN tables or any tables. I know this, and I suspect it still very much applies, because back around 1990 I asked a USN Chief Diving Medical Officer a question at a talk. I said "Yes, we were taught that in cold water we are supposed to use the cold water tables? But no one seems to know if those exist?" And the gentlemen said that was correct. Every shop, boat, instructor, that I had met to that point thought the USN tables were all they needed to follow. The USN officer said no, if you need to wear ANY type of exposure garment, you are diving in cold water, and you need to adjust the tables for that.
So, if you were wearing a 2-3mm suit? Right, you need to back off one or two groups in the tables, regardless of whose tables you are using. And the USN tables are designed to accept a reasonable rate of combat casualties among wartime divers. They are NOT designed to draw a safe line for ALL civilian or military divers.
If your PFO exam says you are good to go, you might consider getting a dive computer. I have no love for them--but they do provide for 1 or 2 "personal factor" adjustments, which are basically doing what the USN said: Going one or two steps more conservative than the normal tables.
And as mentioned, they do give you an ascent rate reading, which you can't seem to get from anything anymore unless you buy the whole nine yards, the whole computer.
Dive operators like to offer people "maximum" bottom time for their money, and they like to use minimum surface intervals so they can make more runs and more profit per day. None of that is oriented for diver safety, the operators are "going by the book" and not considering that a larger safety margin may be of some concern to some divers. By all means, listen to the "divemaster". Then run the numbers by yourself, FOR YOURSELF, on your terms and to your own safety factors. Use whichever numbers come up more conservatively.