I changed wetsuits from 3 to 5mm and added 8-10lbs to keep me down but I still pop up when I’m in the 15-20ft depth. Kinda hard to do the decompression stops with big swells coming by. My dive buddies noticed that I tend to have a lot of leftover air left in my BC when I’m at this depth near the surface. So I’m concentrating on exhausting the BC air and while I still pop up, it’s now the last 5 feet. Get your dive buddies to help you and explain to them what to look for before the dive.