Glad to hear it is working for you! Changing to the non-streaming client was the right decision, you won't regret it.
It's better to just download the game fresh instead of installing it from the discs. By now, there have been so many patches that you won't save a lot of download time, and the launcher on the discs is no longer compatible with the current launcher. It's best to just download everything to avoid running into issues.
