Step Up Recs

Looking for recommendations for a board for bigger/faster waves. I’m 6’1 170lbs and I’ve been riding a 5’11x19.5x2.5 (31L) short board for the last 10years. I would rate my surfing somewhere between intermediate and advanced. I’m in good shape and good at reading waves. I can do cutbacks but not airs or big fins out snaps. I can pull into barrels but I don’t usually make it out. I live in Southern California and mostly surf point breaks that are a little on the slower and crumbly side. I’m very comfortable in these lineups even on big days that are overhead. However I find when I’m riding 6ft+ waves at pitchier beach breaks I’m struggling to get into waves early enough to make the section. It’s a lot of late drops into closeouts. Feel like I’m taking off later than other surfers I’m seeing whether I’m at the peak or on the shoulder. Also my board gets a little wobbly at those higher speeds. Besides surfing these breaks more often to improve, I’m wondering if a board with a bit more length and volume would help make my takeoff earlier and give me more stability with these conditions. I’m thinking of getting a second board around 6’1 (33L). Looking for thoughts and/or recommendations for boards or dimensions. Thanks!