I agree 100%.
I think the best possible way to improve this is split all of the blueprints across all of the missions, and also have the complete blueprint list available for the Antagonist, that way it's a larger pool to get what you want but it's always guaranteed.