I went back to 2.2 and Jailbreaked it with no luck. My wifi is screwed up. I get Wifi only if I place my iPhone right next to the antenna of my wireless router. Looks like I can't go back to the older baseband version on iPhone 2g. My current firmware version is:
04.05.04_G.