I think they should've been endgame. It's hard to watch a pairing for so long and then for them not to end up together is just annoying. Hell, I would've even accepted her with Squiggy, or Fonzie, or freaking Rosie. Just, someone we actually know, ya know?
Meh, I like to pretend the California seasons don't exist anyway, so far as I'm concerned Shirlmine (and Lavenny!) ended up happily ever after. I'm a pollyanna like that. My ships always have a fairytale ending in my head canons.