There are deluxe cd versions
available for $5 more plus shipping, which include the soundtrack plus "other goodies". It looks like the bundle discount isn't applicable for them though.
There's no current upgrade offer and I'm not sure there ever was one, so the outcome is unclear on your second question. Of course the fact that Eyes of the Storm is probably at least a year away makes any answer even more speculative.