If you already running a leaked 2.2, I would suggest holding off and just stay with what you got. If you SBF back to 2.1 and then install the 2.2 OTA, you will no longer be able to SBF back to 2.1 Of course, you may never NEED to, but with this new bootloader, it may be quite some time before we see roms and the like. You'll still be able to root, but it's still advisable to wait and see what Birdman and the rest of the mod crew have to say.
But to answer your question, yes, you SBF to 2.1 and THEN install the OTA 2.2. The bricking problem occurs if you install the OTA 2.2 and THEN try to SBF back to 2.1.