I am hesitating a little bit to advise you another library program as you are already working with Calibre, but maybe a library management program like citavi (
http://www.citavi.de/en/index.html) or litlink (
http://www.litlink.ch/) can help you a lot organising your books, notes, quotes...