I'm fine with either decision, but I think I like the idea of tier armors more. Yoshi said himself he wants to phase out equipment every three months. Would make sense to make tier AF armor.