I'm starting to feel like a broken record here. There is far weaker speculation for BLU than there is for SAM.
- Samurai was the team's first pick for the tank in Heavensward, meaning it's on the top of their list of jobs to add, it was changed last minute to Dark Knight. There is no reason to believe they would then backburner it for another 4+ years, the logical conclusion is that it's coming next.
- Samurai was named directly by Yoshida in-game during the rising event, in the same statement about working on new jobs that named Red Mage.
- It was then later mentioned once again specifically by name in game, acknlowledging that they exist within the lore and setting. This statement appearing in 3.5, right on the cusp of Stormblood.
And while it's an odd and obscure reference the shirt still has at least a credible connection, and while the Batman and Scarlet Witch shirts were more obvious, while the 007 one was a bit more vague, it's still highly plausible Yoshida chose such an obscure reference this time because we already have lots of evidence that Samurai is coming, and thus using anything that would be too easy to guess would prevent people from speculating.
As for Blue Mage, literally the only connection is that yes, Spiderman can be alluding to Blue Mage due to the fact he gained spider powers from a spider, still, there are far better characters to represent Blue Mage if they wanted it to be so obvious, such as Rogue from X-men, or even non-comic book characters such as Megaman. But that's literally it for Blue Mage, the only other possible hint was in a vague comment from the Rising Event (Not by Yoshida's character insert either) that merely reference White, Black, Red, and Blue. On top of that, the reference was not present in other languages, making it exclusively only in the English localization, weakening it's claim.
That's literally it, people have been trying to do tremendous reaches every time there's so much of a mention of the color blue. But the truth is, there's nothing in setting that really references them, and comments by Yoshida himself count against Blue Mage as he has reaffirmed his old ideas at the JP fanfest for Blue Mage, and he would certainly not discuss an unrevealed job like he did mere 2 months before it's official reveal.
You are wrong however. Aside from the nonsense of it being a "different branch of code being merged", the naming and location of the files are specifically in an EX2 folder, classifying them as Expansion 2, mirroring Heavensward folders labelled as EX1. This means they are not old files, especially since they were added along with Red Mage files of which we knew was not in consideration for Heavensward. These are new files specifically added for Stormblood, and labelled and located specifically in Stormblood categories.The files found are much more likely to be holdovers from when they were going to introduce SAM instead of DRK. The reason they wouldn't have shown up until now (if it's not simply a case of them not being found before now) would be because they were part of a different branch of code that was merged.