Moving "make this gift on behalf of an organization" up in Tribute Gift on Donation Form.
The make this gift on behalf seems to go with this gift is in honor. They both are in a tribute gift category. Then it wouldn't be under billing address option.