Sometimes you just gotta decide what is MOST important to you. In my case I was in the same boat at Damselfish. But that is after trying out LOTS of relationships with non-divers only to have them complain every time I went on a trip and try to figure out which guy was I sleeping with etc. It got old for me quickly. Plus I could not share the things I love the most with them.
However this is the exception and not the rule. Most people do need to contend with non-diving s/o's. I just hope that they enjoy the sport if you are passionate about it.
Maybe I'm way off (something new ) but it seems like diving is one part of the larger picture - having a love of adventure.
I love diving and will continue to dive with or without an SO. That's how I found SD (thank you)! I don't want to dump a really nice and thoughtful guy without giving him a chance to try diving. I suspect he'll love it, he has a love of adventure (and a kind heart).