On the ePub front, there is some alternate software that is in beta called
Duokan, that will allow the Kindle to read DRM free ePub. Your Kindle would become a dual booting device, so that you can retain the original software. It's very rough around the edges right now but I have high hopes for this new software.