I still think it would make sense if the Ava from Ep 5 is different from the one in Ep 9, though that would mean Rip has set up an automatic protocol to replace an Ava clone and reinstall all/most previous memories on the new one, since he's in jail during that time.