Complete AZ Credit Form 323 first, listing the entire amount contributed.  At the bottom of Form 323, in Part 4, it states "do I have excess contributions available to claim on Form 348.  Then complete AZ Credit Form 348.  I have several of these every year.