A key point that you mentioned, do the non-resident state first. If using tax software then once you start your resident state's return the software will do all the confusing stuff for you. Just answer the software's questions. From my experience doing a friend's some years ago you may owe RI a little bit.