I would recommend finance. If you are at a top school, like top 20, economics can get you into investment banking. But for the rest of us, the more "typical" you can be, the better. This means a finance undergrad with excellent grades (3.5+ at least) and finance club, internship, or student investment club experience. Starting salary ~$50,000 + 10,000 bonus (at middle and boutiques. Bulge Brackets are about 90k all in starting)
Even with these things, you may have trouble getting into top investment banks right now. Focus on middle market or boutique banks instead.
If you want to be an analyst at a corporation (budget analyst), still, do finance. Economics is good, but it is more difficult (your gpa may suffer) and businesses want you to have a good business background that you can get from finance. ~$47,000
If you want to work for the gov't. do economics. The federal reserve hires economics majors all day for a good avg. salary ~$42,000