As a fellow Galaxy S owner, install a custom rom, darkkys or similar, it makes it a new phone, much zippier and they'll have ice cream sandwhich going not long after the source is released (and it is being released)
The Galaxy phones are some of the most resilient and fool proof devices for flashing.