I would like to suggest an implementation that could be a decisive improvement in terms of ergonomics.
You probably know that (even if WP still does not natively offer this possibility), it is relatively easy to add personalized taxonomies to the media (categories and/or tags), with or without a plugin.
Here is the implementation that I propose: Optionally allow the selection of images by defining one or more categories or tags.