Until Boeing or the FAA can confirm the direct cause of the fire on either battery, the 787 should be Non ETOPS
The only way to even look at ETOPS would be a design change back to Nicad batteries and re-certification with the Nicads as part of the electrical system for the Main & Apu Batteries.
Until then, the rubbish fix which doesnt confirm the original cause of the fault, should result in the 787 staying Non ETOPS.
The Dreamliner has become the Nightmare Liner...a 78 Lemon!
I don't think it's even possible due to space requirements to go nicad. The equivalent nicad batteries would be far larger than the li-ion ones.