I didn't bring this up to the instructor later but I wonder why we didn't descend and swim underwater towards boat? The other diver was starting to do that, and my instinct told me to do that, but the instructor wanted us to stay....so we did.
First congrats on your certification. The underwater world is where God shows off and even after my 40 years of diving I'm still amazed at the oceans beauty.
As for surfacing and letting the boat come get you. That was the right call by my instructor. You indicated that the current kept pushing you away from the boat and you couldn't make headway. So many divers would have done just what you said, descended and try to fight against the current. This can lead to a bad ending such as, using more air because you're working harder and now there is the possibility of running out or becoming to stressed out due to exertion which could lead to heart problems. My instructors main concern was your safety and as these were your first 4 open water dives, there is no sense in pushing that window of safety.
I tell my students and other divers to, "Use your head and not your back." Think about what you going to do before you do it will most of the time keep you out of trouble.
We look forward having you back down to continue your diving adventures and we're happy you had a great / safe dive.
Good Diving