Oracle EBS R12 - Intercompany Invoicing - INCIAP not deriving CCID from INV COGS

We recently upgraded from 11i to R12 and it looks like Oracle made changes to the Intercompany process for deriving CCID (distribution account) for the Intercompany AP invoice. In 11i, if the profile 'Invoice Freight as Revenue' is set to Yes, it ( Program INCIAP - Create Intercompany AP Invoices) derives the CCID from the Inv COGS Account generator for Freight as well the regulat item that is shipped. In R12 it derives the CCID from the Inter-company relationship setup for Freight. (For the regular item it uses the INV COGS Generator)

We would prefer the 11i way. We are planning for customization. One is to do it in the AP Interface table before the invoice is imported. Also we are looking at using the custom hook in INCIAP. Has anyone done such a customization and if yes please advise.