One thing I'd like to comment upon, though -- You don't give the profile you were diving, but if you still had 1700 psi in your tank, it would be my guess that you had not been terribly deep or been there terribly long. If, in fact, the max depth was the 58 feet that you list, a direct ascent to the surface was not only possible but highly likely to be safe. Staying to do a safety stop at 15 feet when you are distressed and barely maintaining is neither necessary nor prudent.
It's really useful to do some further reading about nitrogen loading and decompression. What you get in an OW class is very minimal, and doesn't leave you with much information on which to make decisions on how to handle a situation like the one you found yourself in. You and your companion could have made a different decision and shortened your ordeal, at little or no risk to either of you. But you need to understand WHY that is true.
Edited to add: Every diver should have his own gauges. Doing anything else makes you entirely dependent on someone else for your safety. If you get separated from your buddies (which can happen!) you have no way of knowing where you are in the water, or how fast you are ascending if you abort the dive.