S1 for me, but then for the money you can have a minty 1600i or an average S1 needing a freshness up.
So if you want something to polish up and enjoy while retaining resale value, the 1600i is for you, if you had your heart set on an S1 then will the 1600i live up to your needs or be a substitute.