Simple answer. Yes.

Do a full rewire as said above. Will fix anything non chorus related due to slow speeds.