Finally all fixed after waiting for a new switch. Must have burnt out the previous one and was causing issues with led and popping. Was very careful with this one and took my time to ensure good, clean and fast solders.

Sorry again Sonic for hijacking your thread mate. Regular viewing is now resumed.