A LOT of good thoughts here, you won't go wrong with either one.
If day cruising (or day fishing or crabbing), easy in and out, is the major use you project, then a CD22 is clearly the right choice. And it can certainly cruise for extended periods of time too. The CD22 is a marvelous all-around vessel.
If you mainly want to cruise for longer periods of time, then the CD25 offers more elbow room and amenities and would likely be more satisfying. Everything is one notch larger, and having a head and pressurized hot and cold water certainly is more comfortable. As I said above, the CD25 is just a little too much for easy in and out day cruising, but is perfect for extended couples cruising.
But either boat can fill the bill. Going from 16 to either 22 or 25 should not be the main issue, both are easily doable. It is which one best suits what you want to do over the long term with your new boat that should drive this decision. And the only way to really understand how each one feels is to go out on the water in one of each. I am sure there will be lots of folks who would be happy to offer you a test ride. Don't make the decision until you have done that! Be smart, get the one that fits you best first!