Dash harness meltdown help

so basically its down to

1. Get a 64 dash harness and put a 65 bulkhead adapter on it and get it to work
2. Use my 65 harness and figure out how to change wires on circular gauge plug and make the wiper work by modifying it to a 64 switch or getting the 65 switch to fit and work

thoughts?