Use the backup app, yes it restores everything.
@ Ashley search around the forums, no it doesn't support portrait mode.
It shouldn't invalidate your warranty as you didn't change the product code, you just flashed it with another firmware (I've done it on my US device)