Right, I've known about being able to get the apk for the Market and actually did try to install it, but it failed. From what I understand it must be in /system/apps to work which is write protected unless you root.
I have a VPN so I'll be able to get around the Chinese restrictions, it gives me a US IP address, so I can still do facebook and stuff.
I think I'll just try to flash the firmware and really hope something doesn't go terribly wrong. Do you guys have a recommendation on which version of the firmware to use? Samfirmware.com has a few different ones.