I'm actually having the same issue with the upgrade. It shows $20, then becomes $20.51 at checkout (Canadian exchange rate is quite good right now). But the subtotal is $30.77.
My previous pre-order included a boxed edition, so I've already paid shipping once. Is the difference in shipping between these two versions really $10 more?
Holding off on the checkout until I get this clarified.