Hi Gav,
I just got back from the NBC (we got an upgrade when we arrived at the Santa Fe). Our standard rooms were in the east wing, and tbh, the NBC is so big that I think you've made a good choice upgrading to Admirals floor. We had a long trek from the main building and entrance to get to our rooms almost at the end of the East Wing. That wing needs some tlc too, so I'm guessing its not been refurbished for a while.
Your park tickets are your fastpass - they are free, and you can use them on any ride with a fastpass machine.