Dash Wiring Question

I'm asking this for my other boat, not a CC. The dash wiring needs some cleaning up, and I had a question or two. The ignition switch didn't have an accessory position so I just put a new one in with accessory. What I want is blower and bilge pump un-switched (when I say bilge, it has an un-switched float switch but I want the dash override unswitched as well). I want radio and nav lights on accessory post. The rest on ignition.

Right now there are 4 wires on the ignition post - is this OK, or should I put a junction block and just run 1 wire to the switch? The 2 unswitched items, can they go on the battery post, or same, mount a juntion block?

Finally, I need to splice a few wires - are the butt splice/shrink connectors OK, or should I be soldering and shrink wrapping?

Sorry for the simple questions, wiring is definitely my weakest area!

Thanks Pete! In general the wiring looks OK, still factory stock. Where the prior owner (or prior-prior, not sure) did some work it's truly ridiculous, in a few cases he twisted wires together without even a wire nut, that's relying on hope to keep the connection! The good news is a bit of cleanup will get it back to reliable shape.