As above.

If you are prepared to go to the trouble of making up new connectors, then do it. There are plenty of readily available connector blocks that are much better quality than the OE Yamaha ones. You could even go for waterproof ones?

The other advantage of making new ones is that you will be able to obtain spare parts for them in the future should you need to make repairs/alterations.

__________________