It could be the speaker as well. Once you get it rewired try your first test with a 28mm speaker if you have one. Otherwise my second bet would be to get ahold of Chewbacca (MH) and see if he can look it over.