It should not matter which ever way you choose to go. I personally would upgrade first then apply the license since you would not need to deal with the licensing potentially being a problem and that could eat into how many activations you have left.