HSN CODE Digits conflict

For 1.5 to 5 Crore, rule says 2 digit HSN and for more than 5 Crore 4 digit HSN. Based on this, a Supermarket has prepared about 4 digit 2,000 HSN Codes for about 12,000 SKU.
Problem no.1
It is not possible to enter stock details one by one in Tran-1. There is no provision to upload bulk stock details.
Problem no.2
Tran-1 & Tran-2 requires 6 digit HSN.
But Companies have prepared 4 digit HSN Code list based on the rules and GST Rate list.