Yeah, if you ran out of keys then having a Thief in your team is your best bet to get through the dungeon. You should be able to access Magic Keys again once you get your Airship unchained.