I'd suggest a bigger bag if you can't stick your camera in with lens and battery grip attached. The way you drescribe your hardware suggest a less than pro attitude towards it. I'm not trying to insult or anything, and there is nothing wrong with your attitute towards your gear. But, there is a point where your gear is your gear. You have to strike a ballance between taking care of (so it works), and expecting it to be rugged enough (it shouldn't break from normal usage). Sounds like your getting near that point, but when you still think of it as decoration, its hard to feel your all the way yet.
That said, I like looking at my gear too.
Some retired gear is stuck in key places around the house just for that now. For normal use, I'm mixed between keeping all the gear tucked away in two large bags (which don't hold all the accessories when I add video, extension cables, strobes, etc), and pulling it all out and putting in on shelves. I'm leaning more towards the out on shelves approach. Its all stored in a room that isn't in constant use (i.e. we aren't walking through it stiring up dust) and I keep a large air filter going 24/7 to keep dust down. I use this same room to keep racked computers in so low dust if doubly rewarded. Then, when I'm going on a shoot, I pull out the gear I need. I keep a couple of lists for the types of work I normally do and use that as a starting point, and then pull additional gear if warrented.
I should also say I keep a DSLR with lens always in my backpack that I use for work. Its rare that I can't have a camera in my hands in 30 seconds if I need it, and I'll use my iphone cam if I have too.
Where I'm really bad is putting the gear back up at the end of the shoot. I should take care of that right away, but it often lives in the bag until my next shoot, at which point I actually empty the bag(s) before I start gathering gear.
One last thought, if you live anywhere earthquake prone, bags may be a better choice or your shelves need to be strong and have a front to keep things from falling off.