So you raced a carbon cross bike and are riding a carbon road bike, but for gravel a frankenbike or an aluminum gravel bike, is fine.
Not my decision, but if budget is really not an issue, buy a bike that fits in the same category and your old cx and road bike. You already know what your cross and mtb lack. For someone who used to race, I find it hard to believe that there isn't any pull to put the hammer down at times.
The funny thing about life is you never know where it will take you. If it is not a burden, settling for a bike because you are cheap may just end up just being a $2k expense if you decide to upgrade. The problem is whether that upgrade is an all day adventure bike, or a front of the pack gravel bike.
John