blocks are the same dude
as far as im aware, the only differences between s1 and s2 is a different sized clutch (200mm on s1 and 220mm on s2) and then the crank is different on a s1 (slightly different oil pump design)
but all the bits are interchangeable so no worries there