Solution to my problems?

I have been surfing for over a year now, and have been surfing a 6 8 fish for atleast 11 months now. I started out with a 8 6 bic and changed to a 6 8 fish in a matter of months because I wanted to be one of those shortboarders making those awesome bottom turns and rad cutbacks. Along with the fish came alot of problems (as you can tell from all the questions I have asked on this forum.) There are some waves that I catch and ride down the face and its the best feeling ever. But then there are some waves where I cant pop up fast enough and destroy me. I can get out to the lineup and catch waves by myself no problem. But my question is should I stick with my 6 8 where sometimes my pop up is off and I fall off, or should I resort back to my 8 6 bic? Also is it easier to pop up on a longboard like my 8 6 bic?