I ended up migrating to ebooks.com and importing them into Calibre (after some work to get Adobe Digital Editions to import nicely) and using that to manage my Kindle. Did the same with my old Amazon library too when they were talking about stopping you exporting the azw3's