I'll check if kies has the update, if not i will try that method..hopefully i won't screw up ;-;
edit2: oh ok, i'll look at how to get back to stock 2.1 also then. If i upgrade to 2.2 will it screw up my 3G/HSDPA/Wifi connectivity? I don't want that happening :S