Need help with galaxy S wont un root

[vanrizzel]

Hi all. Last week i rooted my phone and installed lagfix. Now i am new to this rooting etc and to be honest i think i should of read into it more and done it when i was a little more awake and with it. Now my problem is this. I had some issues with the android market (still do) and i started messing round with my phone because i didn't think things through properly. I did a factory reset and then tried un-rooting my galaxy. Now the phone still has super user on it and it says that the phone is rooted and one click lag fix says another lagfix is detected though when i did a benchmark test is reads just over 850 where as before it was 2100 with lagfix. Now i need to know if i can just clean wipe my phone and start over with a fresh copy of 2.1 eclair as if i had just bought the phone.

I've been reading up on all these ways to flash but just ended up with 1000 tabs open and my brain started to hurt. I know i need Odin but after that i just need a simple guide that'll tell me what to do step by step with links to the files i need etc. Also the volume up/power/home button doesn't work i just used debugging mode with a reboot phone file. Anyway anyone that can point me in the right direction or just help me out would be awesome cause i really just want to have my phone back to normal so then i can start fresh.

Thankyou in advance


*EDIT*

i found this youtube vid can anyone tell me if this is what i should do?

http://www.youtube.com/watch?v=PpWcM44On88