With our new programmer, adding some additional functions to the spawn choosing system will probably the first thing I'd like to give him as soon as he's up to speed. Adding some distance between you and an enemy if an enemy is near the spawn you choose may be an option.
And again, we think that the spawn system fixes a lot of issues that were present in the old so instead of completely reverting, we'd like to take steps to make it better. There's a lot of opportunity here and I'd like everyone to give it a chance.