I have been searching all over here and XDA and can not find my answer. so far it seems that the process I will need to take is as follows:

Unroot > OTA Update to 2.3.20 > Root with Z4 > Follow these instructions to get to 2.3.3 > Root

-----

Is this correct?

Is there an SBF file (or something) I could download so I can just go straight from where I am now to 2.3.3?