Yeah I almost thought of trying to figure out how to update to MMS without going to 3.1 since I have the tethering hack. I'm just going ahead and doing 3.1 and waiting for someone to re-hack tethering for 3.1.
I hate to say it but I never had to deal with all these restrictions when I had Windows Mobile phones...

h: