Sorry....Think you've lost it mate.
The original design only needed fine tuning. You've rebuilt it! Why? It is important that your decide on who and why you take your lead about key information and direction, and for what reasons. That will enable you to have a clear focus on the modifications needed. Somehow I feel by looking at your design that you have taken everybodys crit, maybe on other forums and friends etc and then put them all into the mix. The result is a neithre one thing or another. Go back to where you started from, and take a few well thought out steps and your there.