This is exactly what I am thinking about myself of what exactly to take in my final 2 years in university before I apply for the PhD/MA in economics. My interests definitely lie in macroeconomics and I was wondering what math courses would help me better prepared for graduate macroeconomics. Since I transferred from a community college before I cam to university....I couldn't take intermediate macro and micro in my 2nd year

. But it's never too late....I know I can handle the courseload but is this enough with good grades to be competing for a spot in the PhD admission for schools in the top 30? Please be honest!
This is my schedule for this year
Fall 2006
Intermediate Macro (Year course)
Intermediate Micro (Year course)
Econometrics (Year Course)
Differential Equations I (Half Course)
Linear Programming (Half Course)
Spring 2007
Intermediate Macro (Year course)
Intermediate Micro (Year course)
Econometrics (Year Course)
Intro to Real Analysis (Half Course)
Non Linear Optimization (Half Course)
Summer 2007
International Economics
Financial Economics
Fall 2007
Advanced Macro (Half Course)
Advanced Micro (Half Course)
Advanced Econometrics (Year Course)
Complex Variables (Half Course)
Public Economics (Year Course)
Writing a Senior Thesis (Year Course)
Spring 2007
International Macroeconomics (Half Course)
(One course where I can take math or another eco course)
Advanced Econometrics
Chaos, Fractals and Dynamics
Public Economics
Senior Thesis