Getting a New Board

I'm looking to move down in size from my current board and I'm looking for some advice.
Have been surfing for 5 years, but I get out more frequently in the last 2 years.
I currently ride a 6'8 Torq mod fun (6’8” x 21” x 2 3/4”, 41.9L), which I've had for almost 2 years now. I've been looking at moving to something shorter and more maneuverable, a bit more fun, but I'm not sure which options in size, fin set up and tail shape will be best for me.
I'm a college student and I live quite far from the surf which means that I rarely get perfect conditions to surf in and often end up surfing waist high onshore beachbreaks. I find that my board can be hard to generate speed on if the waves are mushy and slow, but it's the most fun when the waves are around shoulder to head high. I can turn fine, but nothing special or advanced.
I've average ability, but it can be 2-3 weeks between surfs especially in the winter. I'm quite fit, and currently am about 75kg/ 165lbs and 183cm/6 feet tall.
I have been looking at shapes like a fish/ twinfin with similar width to my current board, a small bit less volume but shorter. I have seen a few hybrid type boards with a thruster or 5 fin set up that are aimed at average waves/ average surfers but I don't really know which option is the best.
I would preferably like a board that is easier to generate speed on and performs well where my current board doesn't, and I can still improve turning and make the most of poor waves when they're the only option. Ideally, I want to keep as much of the paddling ability of the Torq as I can, because its cold here (Ireland) and surfing in a 5mm all winter can be exhausting haha. I've seen some boards on magicseaweed etc. that are around 6' and in the same volume range.
In short, if you were to move from a 6'8 fun board to a smaller board, what would you be looking for, with an aim to get something that's faster in bad waves?
Have been surfing for 5 years, but I get out more frequently in the last 2 years.
I currently ride a 6'8 Torq mod fun (6’8” x 21” x 2 3/4”, 41.9L), which I've had for almost 2 years now. I've been looking at moving to something shorter and more maneuverable, a bit more fun, but I'm not sure which options in size, fin set up and tail shape will be best for me.
I'm a college student and I live quite far from the surf which means that I rarely get perfect conditions to surf in and often end up surfing waist high onshore beachbreaks. I find that my board can be hard to generate speed on if the waves are mushy and slow, but it's the most fun when the waves are around shoulder to head high. I can turn fine, but nothing special or advanced.
I've average ability, but it can be 2-3 weeks between surfs especially in the winter. I'm quite fit, and currently am about 75kg/ 165lbs and 183cm/6 feet tall.
I have been looking at shapes like a fish/ twinfin with similar width to my current board, a small bit less volume but shorter. I have seen a few hybrid type boards with a thruster or 5 fin set up that are aimed at average waves/ average surfers but I don't really know which option is the best.
I would preferably like a board that is easier to generate speed on and performs well where my current board doesn't, and I can still improve turning and make the most of poor waves when they're the only option. Ideally, I want to keep as much of the paddling ability of the Torq as I can, because its cold here (Ireland) and surfing in a 5mm all winter can be exhausting haha. I've seen some boards on magicseaweed etc. that are around 6' and in the same volume range.
In short, if you were to move from a 6'8 fun board to a smaller board, what would you be looking for, with an aim to get something that's faster in bad waves?