Should I switch my major to Economics?

I suggest you take a couple of economics classes first to see if you like the subject. But your plan sounds good.