I have this solo / girlfriend duality problem as well.

It has prompted me to install a jib on my H17, and soon, I'll be taking that jib off and adding some kind of foresail (thats sill up for debate). While I love sailing single-handed, bringing the girlfriend along is the problem. She's a very active sailor, and accomplished crew (how do you think I met her) so making her sit on the wing all day is just torture. I'll like having the option of sailing one-up or two-up, and I'm really going to be looking for a foresail solution like the MX-RAY so I can use it singlehanded.