If you're going with generic A-wings, would you consider dropping Yavaris? Yes, double tap B-wings are nice, but I find Yavaris is always in the zone of maximum danger as a result, and dies frequently. And the Aces really benefit most from Yavaris' effect, with generic squadrons having a slightly less pronounced benefit.
I'm going to suggest you replace Yavaris and Salvation with:
AFIIB with Flight Controllers & ECM (and maybe move Adar here)
CR90a with Jaina's Light and TRC
If you want a Most Wanted Ship to give up, then Jaina's Light is better able to stay out of harm's way than Salvation, and gives up fewer points when destroyed. With TRC it can still contribute a surprising amount of damage, if slightly less than Salvation level. In comparison, the AF should make up for the lost firepower since it maneuvers more compatibly with Independence, still has decent damage output, and increases your ability to win the squadron fight. I think you'll have to drop Jan down to a regular HWK to fit this all in, but you still get the Intel effect.