I saw one of your comments that indicated an issue at 20ft is much different than an issue at 60ft. It really should not be that different. Start to consider what can go wrong and mitigate it at depth. When scuba diving, the surface should always be your last option and in my book, the least desirable option. Plan and train to fix all issues at depth, you have a buddy with more gas, buoyancy, and anything else you might need. Plan for things to go wrong, then when they don't you can enjoy the dive. I am not advocating for you to stress over what can go wrong, but rather a plan if is does. Planning should help alleviate the anxiety.
I agree with other, this should always be fun! Dive a depth where you are comfortable. But start to plan to resolve everything at depth and the surface is not your lifesaver, your plan is your lifesaver, even at 20ft.
I hope this helps, keep diving and keeping it fun!