Advanced Beginner/Intermediate Board?

Hi all. I read through a bunch of posts here, let me start with me:
Years surfing: 2.5 (age 39)
Height: 5'6
Weight: 170
Fitness: good, 3x week gym. Minor consideration is that my pop-up is a bit slow because my right lower leg has some hardware (I broke my tib/fib ~20 years ago) which makes it less flexible.
Surfing: 2-4 times a week, waves (face) 2'-6' (most days are 1-3 or 2-4 at my regular spot). I mostly surf at Diamond Head on Oahu, which the wave quality varies a whole lot.
I started with the Wavestorm from Costco. After I got ok on that, I bought a 6'6 board that was really thick and wide (I can't recall exact dimensions, but think like a longboard just shorter). I couldn't make this board turn much, but it taught me a lot about paddling and pop-ups..I just sold it for about what I bought it for, so all told it was a good move. I also picked up (super cheap) a 6'6 minigun, which is what I'm currently riding. I think its a bit too thin and I think the shape is wrong for what i'm surfing. That all said, I can get up on it without too much effort, but I certainly don't paddle for as much as I did with the thicker board. So I'm shopping.
I keep getting asked what my goals are. I'm not 100% how to answer that question. My goal is to have a good time, spend some time in the ocean and get some exercise. I'm not sure what else to say there. I'd like to be able to turn and go down the line more consistently. I want a board that fits in my Honda civic so I can surf before work. I'd like to be able to hit the lip and come back. Are these the goals they mean?
Here's what I'm thinking..any advice is appreciated:
Length: 6'2-6'8
Width 18"-20"
Thickness ?
Squash or Swallow tail
Nose: rounded or rounded point
Years surfing: 2.5 (age 39)
Height: 5'6
Weight: 170
Fitness: good, 3x week gym. Minor consideration is that my pop-up is a bit slow because my right lower leg has some hardware (I broke my tib/fib ~20 years ago) which makes it less flexible.
Surfing: 2-4 times a week, waves (face) 2'-6' (most days are 1-3 or 2-4 at my regular spot). I mostly surf at Diamond Head on Oahu, which the wave quality varies a whole lot.
I started with the Wavestorm from Costco. After I got ok on that, I bought a 6'6 board that was really thick and wide (I can't recall exact dimensions, but think like a longboard just shorter). I couldn't make this board turn much, but it taught me a lot about paddling and pop-ups..I just sold it for about what I bought it for, so all told it was a good move. I also picked up (super cheap) a 6'6 minigun, which is what I'm currently riding. I think its a bit too thin and I think the shape is wrong for what i'm surfing. That all said, I can get up on it without too much effort, but I certainly don't paddle for as much as I did with the thicker board. So I'm shopping.
I keep getting asked what my goals are. I'm not 100% how to answer that question. My goal is to have a good time, spend some time in the ocean and get some exercise. I'm not sure what else to say there. I'd like to be able to turn and go down the line more consistently. I want a board that fits in my Honda civic so I can surf before work. I'd like to be able to hit the lip and come back. Are these the goals they mean?
Here's what I'm thinking..any advice is appreciated:
Length: 6'2-6'8
Width 18"-20"
Thickness ?
Squash or Swallow tail
Nose: rounded or rounded point