I'm torn between getting a Kindle Fire and the Nexus 7. I have a lot of Kindle books, but also a lot of video content purchased through Amazon as well. I feel t

I'm torn between getting a Kindle Fire and the Nexus 7. I have a lot of Kindle books, but also a lot of video content purchased through Amazon as well. I feel that the Nexus 7 is a better device as it's not locked down to Amazon's eco system, but the lack of a Amazon video player for Android (without having to sideload the apk that is) leaves me in a weird predicament. My wife has a Kindle Fire, I love the form factor -- my iPad 1 is getting long in the tooth and isn't as "portable" as the KF -- but I'm still bothered by the lock-in of the device.