You're right, the mods are all pretty disastrous IMO.
Also if you're worried about those leaked 'stock' roms, theyre just TAR files afaik, people on that forum regularly pull them apart and diff the binaries against those compiled from samsung's official source code which you can get here: http://opensource.samsung.com/reception/reception_main.do?me...
In CyanogenMod's case, you can have the stock feel with more options.
But Samsung sucks - I am not going to buy anything they sell - even ignoring all of the rumors they have badly botched up by not updating to 2.2 for all of their US Galaxy phones for so long.