First of all, welcome to the Forum Matty. Secondly, do you have the factory wiring diagram for your particular model? You can find manuals & wiring diagrams to download on this site.
I agree, it's a mess in the bucket, however if you go grouping a bunch of wires in block connectors, I reckon it makes it harder to service the loom when the need arises. At least with the bullet connectors you can deal with just the one you may need to access. Just be sure to mate like colored wires & clean each connection before you plug em in.
Cheers.