Yep, exactly what the TF-man sez :D
I kept all the same hardware, including the S1 (don't use it though). I tell a lie, I snipped off the treble-bleed capacitor I found across the volume - that won't help on the thin/weedy front. Try removing that now if you haven't already. Not sure where it will get you though - I've since tried the Baja pups in another tele without a bleed, and I replaced them with Blackguards too!
Soldering onto the S1 was a little more fiddly than standard, but if I can do it, anyone can! :lol:
Good luck. Hopefully you'll get the same thing as I did with the BGs - I went from "I just can't get into this tele thing" to "Oh wow, what an instrument" in the space of just a couple of hours (and more teles in a couple of months :roll:)