Us telling you what
boat to get is like ordering a mail order bride. She might give you sons, but she might also be as visually pleasing to you as the side of a barn.
Find a marina, and go walking up and down the docks. Talk to people about their boats. Go sailing on the ones you like, most people are pretty helpful on docks and would love to take someone out that might share an interest in their brand of sailboat.
Do lots of reading, and looking at pics of boats, but that is no replacement for getting your feet on them.
I went from a mac 25 (similar to yours) to a Clipper
Marine 32
center cockpit ketch diesel. Pretty rare sailboat in that they have been out of production 35 years. I did my homework, and that was the boat I fell
head over heals over. Finding one in passing
survey condition was the challenge, with a trailer! It took me about six months of looking daily all over the
Internet. One showed very far from Nebraska, in LA.
My
advice is look at sailboats still being made, as they are close by, and easier to find
parts for.