I don't think it will still be re-indexing after a week or so. Yesterday without reading anything it was already down to 50% !
Yesterday I resetted it (causing it to loose all my collections btw !!), reloaded the battery to full, and put it to sleep (wireless off).
If tonight there is battery drainage, I will return to 2.3 (having lost my collections anyway)
I put the matter to Amazon, see if they respond in any way...