You sound like you are at the point where improvements in technique, surface dive, weighting, finning, relaxation, etc can make a significant difference in the time you can spend at depth. Good time to take a course. That will expose you to great technique and advice on which areas you need the most work in. Your pool access is a great resourse for improving technique. Recognize that it takes years and enjoy the process.
Surface dive: Lots of efficiency to be gained here that translates into dive time. With a 5 m pool, you have plenty of depth for pool practice. Read up on efficient surface dives, practice and see how deep you can get with a simple dive plus one arm stroke. Find the most efficient for you and practice till its automatic.
Same thing on the other areas above. Good technique in all of these reduces 02 consumption and lengthens dive time.
The big thing in all of this is relaxation. Everything you do should be very relaxed, nothing is moving except what has to be. A great drill is, while diving, think about tension in each part of the body. Start at the head and relax anything not being used, go to the neck, shoulders, core, upper legs, lower legs, etc. Then do it again. You will be surprised at how much tension has returned. Do this over and over until things stay relaxed. If you go to sleep between dives, you are getting there.
All of this brings a series of small improvements in dive time, which, in total, can be substantial.
Another area is breathup. Learn to take down more c02 when you dive, less ventilation, the "no warmup" idea. For serial diving the process is a bit different, but it still works, bas- ackwards as it sounds.
Finally, you might consider learning to dive FRC. It takes quite a bit of practice, but you have access to what you need. Once semi- mastered, FRC can give you a substantial increase in bottom time, provided your diving style fits FRC. Lots of other advantages. One disadvantage, it reduces you depth capacity substantially, although much of that comes back with time.