Well I just did some test purchases from Kobo (knew that worked already), Hive (knew that worked already) and Rebellion Publishing (hadn't tried them until now) and running them through Calibre they all worked seamlessly so this afternoon I am going to say goodbye to Amazon and delete my account
Looking at smaller publishers/ retailers like Rebellion and Hive has actually bought back some of the joys of shopping for books, Amazon had become too big and bloated with unrelated hits to any searches I did to be fun anymore.
Haven't tried Angry Robot yet, *sigh* looks like I will have to buy another e-book