Yeah, the pre-order is separate from the CE.

On the other hand, if you don't want to or can't immediately play at the launch of the expansion, you can hold off on registering the CE and save that free month until you can use all of it.