Hybrid for gravel trails and sandy/salty winter streets, but mostly use my road bike. I prefer the road bike position so I'm thinking of trying to find a used cyclocross to replace the hybrid. I started back on the hybrid and loved it; now, I find it uncomfortable. But that's me.

You have to read yourself. Is the hybrid more comfortable for you? Some people are self-conscious on a road bike, but more comfortable when they start riding on the slower hybrid. If you haven't ridden for years, the hybrid usually feels more stable.

And where you're riding--trails or road? Nice roads, or roads that should have been repaired 20 years ago?

Either is a great choice. Try them both.