Gear update

Now I am officially a gear whore. I have been enjoying putting together my climbing rack and gear as much as I have been enjoying the act of climbing itself (which is not much in the last month and a half.)
An update to my rack:
Biners: 67Locking: 15, i truly need no more than half a dozen. One for my belay device, four for anchor set ups, and one emergency.Ovals: 17Ds: 6All above used for racking (a few too many, but what the heck...)About 28 are used for slings/quick draws. Two on double shoulder length, four on 10 cm dogbones, and eight on 24" slings.
Protection:One set of black diamond nuts, 4-13One set of BD hexes, 4,5,6,8,9,10One set of tricams, .5,1,1.5,2,3,4One set of mixed nuts, bd nuts 2,3,5,6,11 & WC rocks 5,6.Also have extras of a hex 10, metolius curved hex 5.
Camming units:Metolius tcu Metolius fcu 2Metolius tcu 3Metolius tcu 4BD camalot .75BD camalot 1.0BD camalot 2.0Metolius fcu 9Wild country fcus - 1.25, 2, & 3.
All the above protection covers range from .48 cm to 9.45 cm. I need small size protection (probably bd cams .1 & .2, & one larger sized probably bd 5).
All hung on Metolius gear sling. Quick draws on harness.
One prusik, two lengths of anchoring rope. Nut tool ( I prefer BD's. Used Metolius, but doesn't have enough reach.)
Currently I use a 50 meter 10.6 mm diameter rope by New England ropes. Plan on getting a 60 meter 10.6 mm standard & retain my 50 m for toproping alone.)
Belay devices, two BD ATCs, One BD ATC guide. One GriGri. Do I need more? If I don't sell that Camp Yo Yo, then that will be five. Used to have two figure 8s, gone now.
For emergency, two pulleys, one petzl basic pulley, and the other Kong Turbo roll. Need to get couple of ascenders.
One switchblade knife.
Helmet Ecrin Roc.
Harness, Mammut Focus & Petzl Corax.
Shoes, one sportiva something and one 5.10 something. 5.10's lost rubber, needs resoling. Also need another pair of shoes for long multi-pitched climbing.
For top roping, I have another three lengths of webbing. (50', 50', 75')
Two chalk bags (or three if you consider that manky one I got with some gear on ebay.)
I carry the gear in North Face Spire 38. Perfect sized pack to get most of my gear in.
Additionally I carry a rain jacket, pack cover, small first aid kit, head lamp (Princeton Eos), bug spray, sun tan lotion, energy bars, water.
Approach Shoes, Timberland something, Tevas on warm days with easy approaches, now my Merrell Stretch (these are awesome). I would love to add Timberland Cadion to this list, as I love the comfort and the water proofability of it.
Preferred apparel. abrasion resistent Cotton pants with some give (don't want the rrrrip when I am on the rock.) Cotton's fine rock in my opinion. breathable old cotton. For uppers, a wicking T, long sleeved or short.
A pair of interchangeable lens sunglasses (currently a Julbo Magic something.)
An old watch that hangs light and can take a ton of hits. Need to know the time, while climbing!