Supply chain speaking, my modern HED disc is due in February sometime.
This purchase was before Aerocoach did tunnel testing on combined CRR/CdA measures of tires. Whoa and behold, the clinchers I already run test faster combined CRR/CdA than the tubeless I hoped to go to for that wheel. Tubeless "might" save you in a race, but in reality if you lose 1/3 of your tire pressure it being road instead of lower pressure off-road..........you likely are slower enough your day is hosed anyway.
Soooooo, it'll be a marginal gain going to proper tire size on the new disc versus a tire that's too big right now.