Updating bootloader and baseband for non-OTA?

[burpootus]

I'm in the same situation. I resisted the OTA until a full SBF was available and when I read reports that OTA seemed to overclock better than leaked 2.2, taking the easy way out I flashed the full 2.2 SBF. I thought this would completely reformat the phone to the current 2.2.15 software. But I am now also still on the 30.01 bootloader. I guess it makes sense now, how could the bootloader be overwritten while you are actually using it while doing the SBF. Anybody figured out a way around this?