That's a nice collection!
If HT does release an Ant-Man Falcon (though I still maintain the conviction that it's a slim to none possibility), I'm actually inclined to say it would likely be after CW, and would perhaps be an exclusive figure where they don't release all that many. The reason being is because Falcon's appearance in Ant-Man was a mere cameo, and presuming that it's all but certain that HT will release a CW Falcon, there would be little to do with regards to having to manufacture an entirely new figure. They can simply reuse the CW Falcon with little to no changes to the body and suit and simply package him with a different base/stand and include a different accessory or accessories that conforms to the Ant-Man film.
They might see if they can make a few sales off of something that would require minimal manufacturing.