Here are some good boards to keep in mind. Since you are stepping down look for something around 6'6" maybe a bit shorter. That's a big jump. There are a lot of fish boards that are good. Almost all manufacturers make them. Other boards to keep in mind are CI Flyer, Lost SD2, Lost RNF. Roberts Anything, or White Diamond are great. Xanadu, Gipos or pig. Both are wider and a bit more stable. Or if you want to go new check out some of the local shapers. They can make you something that will fit you and what your looking for.
I stepped down to a 7 foot funboard I picked up from Degree 33 and it was something like 400. All they have are epoxy boards but it got to my house really fast. Just got a used shortboard but hasn't been good enough to use it.