Need help with phase 5 board choice and size

Hello I am 5'11'' and 190 lbs I currently own a phase 5 prop (54'') and I think It's a little bit slow for my weight. BUT I bought it used and it have a 2'' fin at the back and a 1'' fin at the front...I will put it back to stock with only 1'' fin at the back to see if it help...

My question should I go for a carbon pro 54''?? will I see improvement because it's about the same size as my prop but carbon ...or should I go with a 58''? at 58'' I'M litlle bit worried it will be harder for tricks but it will probably be faster...

Or I should save money keep my prop and buy a surf style witch I would like to try also...

Thanks for your help