Default [Q] Query about Upgrading

Hi guys,

I've been reading through the forums, but frankly getting lost with all the different firmwares etc and the state of my current Galaxy S - so not sure how to proceed to get Froyo or at least a different rom to attempt to force an official update via Kies.

I have tried older versions of Kies (and newer too) with and without the Registry hacks etc - but to no avail.

Anyway, the status of my phone is:

Unbranded UK Orange phone.
PDA I9000XXJF3
PHONE I9000XXJF3
CSC I9000ORAJE5

Firmware 2.1-update1
Kernel Version 2.6.23 umts_scm S1-BUILD05 #2

I have installed the One Click Lag Fix to root my phone (moving files to the ext2 partition etc) and of course have super user.

Questions are:

(1) Do I need to Unroot my phone to update

(2) If 'yes' to (1) above is it a case of just selecting Un-root in One Click Lag Fix?

(3) What best Rom/image to flash and where to get them from? Repository I had bookmarked is not closed

(4) Anything else?

Sorry for the questions, which may have been answered one way or another - but the search wasn't bringing anything conclusive up

Thanks in advance guys