Zboss, you're doing the same as I would. But I had to replace the AC panel as the previous owner had had a fire (or serious smoke at least) behind the panel that the survey
didn't pick up so I decided to redo the AC panel. But the wiring
behind the DC side was so kludged that I decided to redo that to. (I am/was a marine electrical
tech so it was bothering me on my own boat. E.g. the cobbler has no shoes....).
So - I found that it became one of the things I was most proud of on the boat and I got a sense of joy every time I looked at it and knew it was the best it could be. But one way to really tidy things up (if it matters to you and/or just needs it) is to put a long row(s) of term strips behind the panel and put all the wires that go out to the devices on the boat, one terminal for each circuit breaker plus any for alarms, switches, whatever. Then take all the wire from each breaker and run it to the term strip. You should have extra wire which you can use to "tidy" the runs up, label each wire, etc. Then run new wire from the term strip to the breakers, using enough to allow nice tidy bundles and layout. It can really clean up decades of fixes and poor wiring without changing the panel itself. And if you ever decide to replace the panel then most of the work is already done.
But that would be silly unless it mattered to you like it did me. I hate nasty wire runs and will be redoing a lot on my new/old boat in the next year or two. One side benie though - you learn some interesting things by poking around with all that in thorough detail.