Switching from 1.6 with storage upgrade to stock android

I think you could be interested in reading this post of mine.

In addition to what you can read there, I wonder if you have tried clicking on the Stock button a few more times.
I remember the first time I had to do so in order to go to the next screen where the download option is.