I'd go for coil pack, Jano at oddkidd creations did my s2 last year and it totally transformed the drive.