Just reset your phone to factory settings... android market will work fine after the phone reboots with froyo....
beware to backup your contacts as restoring to factory settings erases your contacts completely... you might also lose some applications installed. chose before you do this