Ok, I don't know exactly what to tell you because I WAS a music/foreign languages major, but decided to switch over to communication disorders/speech pathology because I want a good/stable job when I graduate. That said, I think you're thinking about the future.... you want to make sure you have a job when you graduate...and well, the greatest job demands lie in the health field or teaching profession.
If you like teaching you could do that; you'll always have a job. If you'd like the explore the very broad health area, you might like to consider nursing (you'll always have a job as well), rehabilitation (what I'm doing), or even biology/pre-med. I know it's outside your area, but I only mentioned this because you're in Texas too and those jobs are in crazy high demand. (i'll pm you with more details)
You should honestly do something you'll love (because you'll be doing it for a looooooong time) but also something that pays off when you're done (not necessarily that you make loads of money, but simply that you can find a job).
By the way, the SCUBA thing is GREAT; my husband and I got certified 3 years ago....you might be able to do it on the side or something. It is super fun. Anyway, let me pm you some more information.....maybe it'll help you out
