Have a look at beta, I think you'll find in most cases Indexes come right after their tables. If you find some exceptions, let me know and I'll take a look at it.
Leave 13.1 installed when you install the beta, so both are installed. Get the same bit-version too so you can use the same Oracle client that you already have.