Two things;
(a) Try not to focus too much on the bike. With the right kit selection and routes choice you can enjoy it on anything (though I appreciate that in your current situation, dreaming about kit/bike choice is extremely inviting).
(b) I wouldn’t not have a traditional, “flat-bar” MTB for bike packing, even though I may use other bikes on occasion too. Gravel/adventure bikes can be ideal on the right routes but for me would be too limiting on most others. The CAADX would, I reckon, be fine. The Habit could be made to work too, though you might question the compromises imposed by a FS frame.