Interestingly, T-Mobile seem to now be claiming that they're going to be able to offer an OTA update to Froyo:
T-Mobile Discussions - Discussions - Samsung Galaxy S 2.2 update
T-Mobile Discussions - Discussions - Samsung Galaxy S 2.2 update