No, you shouldn't purchase either of the Bundle Editions as these will be gifted to all existing customers who purchased before Tuesday 26th April over the course of the next week or so.
As part of the Product restructuring to bring Arena and Horizons, you should now think of the Game as collection of Products. There's the Elite Dangerous Physics Engine which everyone gets, then the Elite Dangerous: Arena content (for CQC) and the Elite Dangerous content, which is the current full game and includes CQC.
Existing customers (those who purchased before Tuesday 26th April) might only have the Elite Dangerous Physics Engine at the moment, but that will still give you the full Elite Dangerous content (including CQC) that you have always had.
New customers get to choose the Elite Dangerous: Arena Edition (for CQC) or Elite Dangerous Standard Edition (for the Full Game and CQC).
New Xbox players who purchase the Elite Dangerous: Arena Edition can still play CQC against those Xbox players who own the Full Elite Dangerous game.