When you're dealing with finger picking you have to think of how you are setting yourself up for the NEXT notes. Sometimes it's better to break away from the imimi and switch it up. Especially when switching between strings.

Generally you want to stick with the fingerings that you are being given. Sure it may be hard, awkward, or even feel wrong to do like you are thinking, but that's kind of the point of practicing. Practice the hard stuff and it'll become easier.