I could use some suggestion for upgrading my Epiphone Riviera. This is one of the newer limited edition China Custom Shop versions. The neck pickup doesn't work anymore. I figure it's just a connection since it used to and the pots are really spongy for lack of a better term. So I'd like to change out the pots, switches and tuners. Possibly the pickups but only if there is a good recommendation on a period correct mid 60's sound. Love the Epiphone brand. I had a 1971 a long time ago with a vibrato bar. This one reminded me of it plus I'm a Magic Sam fan and he used a mid 60's Riviera also. Thank you in advance if anyone has any knowledge to share.