Hi Tomasz,
Thanks for the comment.
1. I disagree. I provided all AMP pages with a canonical URl as per the AMP specification. When Google noticed a problem, it should have handled the redirect gracefully.
2. I don't. I use a CDN to cache the pages - but only for a few hours.
3. I did use webmaster tools. I requested a full re-crawl. That happened fairly quickly, but didn't stop the problems.