Same situation here (except for the battery)I currently have an iPad Air 2, but the battery life has dropped considerably. I use it quite a bit when I travel, as I am usually in small towns for work and little or no access to tv shows or movies in small no-name hotels so I always bring 5 or 6 movies and usually end up watching at least 2 or 3 per trip. I like the iPad Air size, and 256 GB I could preload a lot movies and shows. I could also afford to put my music on the iPad with that much memory (...).
Just ordered a replacement to my trusty iPad Air 2, 32 GB and always full to the brim. Best iPad I ever had and still going strong.
I'm getting the new Air with 256 GB which will allow me to pack more music, movies and work content, too, since I also use it for work. I also ordered a Pencil for note-taking.