SpaceKadet:
I read in a gardening book that when you move to a new location,don't remove or plant any trees or large shrubs for one year. Live with the status quo ante for one interval of seasons first and learn from the experience.
I would advise you to live with your system for one year. A year from now,you'll be able to make better informed decisions.
All the best,
P