Downloading modified Kindle ebooks

I have Calibre for my ebook library. I sort out the formatting, metadata and add page number data from Goodreads. I then connect my Kindle to my laptop and transfer the books over usb. Is there any way I can have the convenience of downloading books direct from Amazon on the Kindle while being able to use my modified ebooks?