Fields on images, displayed on edit page
I did similar with creating photo albums connected to a content type using the field_collection module. This way you can easily customise whats added very quickly as you are essentially creating a new type of entity (think of it as having an article entity and attaching a new photograph entity which has its own image, caption and credit fields).