Credit Analyst at Barclays
Santa Cruz, California
Finance is probably the better option for you.
An undergraduate degree in Economics is designed for you to pursue further graduate or doctoral studies. Not many organizations will hire you to do economic analysis with just a bachelor's.
On the other hand, Finance can be a terminal degree and many employers specifically want Finance majors since that degree contains practical, commercially applicable knowledge. Economics is more theoretical. Things like Keynsian macroeconomics or the Laffer Curve have very little practical use if you want to work in an international bank.