There will be a rebate for battle armor. Yes always wait for a battle armor rebate to upgrade your battle armor even if you don't have enough to level so you build the habit of doing it then since you get rewards based on you leveling your armor. If you leveling your armor outside the rebate, you won't get the rewards from the rebate.