Surfboard dilemma !

Aloha Riders !
So guys here is the situation, Im a relatively skinny guys 160lbs (muscles not fat) 6"1~6"2 tall... been surfing regularly for the last 15months, 1 to 3 times per week, it is very addicting, anyways i started on a 8" softTech foam board, then changed after a few weeks to a 7" foamboard as well. lately i have been thinking to go down to a short board, I tried a 6"2 Fish, 21' in width double fins, and I surfed great on it. but it wasn't mine its my friends now I was thinking about getting something shorter like a 6" short board that is pretty wide maybe same width! is tht a good idea or will be frustrated ?
the question is , should I get a fish 6"2 ? or a shortboard 6" ?
So guys here is the situation, Im a relatively skinny guys 160lbs (muscles not fat) 6"1~6"2 tall... been surfing regularly for the last 15months, 1 to 3 times per week, it is very addicting, anyways i started on a 8" softTech foam board, then changed after a few weeks to a 7" foamboard as well. lately i have been thinking to go down to a short board, I tried a 6"2 Fish, 21' in width double fins, and I surfed great on it. but it wasn't mine its my friends now I was thinking about getting something shorter like a 6" short board that is pretty wide maybe same width! is tht a good idea or will be frustrated ?
the question is , should I get a fish 6"2 ? or a shortboard 6" ?