WOW! You're definitely not invited over to my house if you think your shop is messy. Looks pretty good from what I can see. I also like you plan. Sounds like a nice layout with just about every tool you'll need w/ it's own dedicated station.
If you haven't already gotten a copy of "The Hammer," be on the lookout for any volume you can find. It's a paper back book that is a culmination of some great articles from various black smithing publications. There's a ton of how to and quick tip type info that'll save you a lot of time in the end.
Also, since you obviously like making your own tools (very nice grinder by the way!), you have to check out Lindsay Books.
Lindsay's Technical Books
You can find plans to build dang near anything, including a few cool blacksmith tools. You've really gotten me excited about trying to get back into bladesmithing. My big issue now, is that we're hoping to move (better school for the kids) and will most likely "suffer' a substantial down size in lot size. Tell me again about trading futures....