It's very likely to see the retooled YF-21, both Yamato YF-19 and YF-21 were the generation 2 toy line like the 1/48 VF-1. The VF-11B on the other hand is their generation 3 toy line, which is the first toy they released before the V2 VF-1, so they have the same built and quality, which I don't think they will retool the VF-11B.
For some reasons the VF-0 from Yamato never look right to me, they kinda have the 1/48 VF-1 syndrome with huge nose and bulky legs. I believe the VF-0 should have slimmer legs like the V2 VF-1 when Arcadia comes to rework it.