Unfortunately, it is highly probable that the 1.6 update will break your world. I'm not really sure why, but thats what I heard on the grapevine.
I guess you could always build your old stuff in creative mode, then switch back to survival. That's about as close as you're likely to get i'm afraid.