After about a year, I have finally decided to change my brick.
Without splicing the harness. All new wires, and connectors.
Unfortunately, California's License Plate is either too big, or Japan's Plate is too small. Currently my plate is zip-tied onto the mount.