I would go geology (and I did). It is a more immediately marketable degree than earth science (depending on which sub-discipline of geology you go into, more marketable than others). In case you don't get to the oceanography degree quickly, geology is probably better. Further... oceanography and marine geology are really cool, but there's essentially no market for the skill and knowledge. Again, I worked in engineering geology for a few years right out of college, and when I had a good position in the company, I went to a local private school for a masters in marine geology, a fascinating subject. But *boring* in school. I quit, saved my money, and continue to enjoy marine geology as a hobby and interest.
It is almost safe to say that you will never get a decent paying job with any degree in oceanography, no matter how high, unless you "know someone."