upgrading to a real board when I'm ready in the mean time...

Ive been surfing almost any chance I get and have gone as far as just having my foamie in the bed of my truck just in case I want to go after work for a bit. I've managed to catch a few more waves here and there and still learning a proper technique for my paddle and a good balance after the pop up. I've been just browsing around and looking at a new board when I think the time is right and wanted to ask a few questions as to what to get next. Now I know I'm no where near ready for a real shortboard and the waves here don't get past maybe 6ft on a good day. Padre sees better days but an 8 hour trip every weekend isn't going to happen. So I will settle with whst I have till other wise. So do I go with a legit real tri fin funboard/mini mal or could I go with a fish? I've heard and read thst a fish does pretty well in mushy and small waves with the added width it has over the shortboards plus let's face it I wanna go fast lol. What would you suggest and from where should I get it from? Should I speak with a shaper or get a pre made one? If a pre made one, by which company should I stand by?