You can reverse the rooting as far as I know. Just flash back the stock rom and kernel.
As for CM7, I tried it today and I preferred the stock Samsung rom... i just might compile and build the stock android rom when ICS source is released (and android.git.kernel.org is working).