haha been reading through. you think you have a nice custom wire job under the bonnet, should see the hell under mine. for some reason. i have a box with a light switch on it that starts the car if the ignition is on. god knows why but its there and makes for one hell of a wire mess along with my stereo, alarm and other gadgets =]
will have to show you a picture. then you can be thankful yours isn't too hectic.
EDIT:
to the far right. my wonderfull light switch