Possible safety/match options for an international economics student?

I would look at Wisconsin. It is a top 10 graduate program in Econ. Excellent CS program. The undergraduate program in Econ is big. It has a specialized track if you are looking at grad school(math heavy theory). Wisconsin is a little easier to get into than UCB or UMich.