Job Cost Retention Invoicing while using BT/ST

We would like to use Job Cost Retention in Sage 100 Premium 2021, but currently Sage does not support the Bill-To/Sold-To (BT/ST) feature within Job Cost (which we need because all our jobs requiring Retention bill to a GC or third party). Adding Job Ops is not an option at this time, but handling retention properly would pay off so I think I have a workaround. I'd like feedback from the community on two possible solutions I've found:

Process the job as usual (we use AR Invoice Entry as it allows BT/ST). In my tests the correct amounts appear correctly in AR, hit GL Retention Receivables, and post to the Job Cost. The only problem arises when attempting to use Job Billing for the Retention Invoice--GL posts correctly but the retention invoice appears on the Sold-To account and the Bill-To account still shows a retention balance. To get around this I found this works:

1. In AR Invoice Entry, create a Credit Memo on the customer account: enter the Bill-To account# and Job# as usual. Enter the full retention amount to be credited, and change the Retention field on the Totals tab to reflect the entire retention amount to be cleared.

2. In AR Invoice Entry create an invoice on the customer account: enter the Bill-To account# and Job# as usual. Invoice the full retention amont, and change the Retention field on the Totals tab to ZERO.

This does create an extra CM transaction on the Bill-To account, but otherwise does what I want: remove retention in AR, GL and Job Cost.

The other option is to allow a Sales Order on one account to be linked to Job Cost on another (BT) account. This would allow us to use Job Billing but we aren't using it now and don't miss it, and the billing would only link to the BT account--we'd like some sort of link to exist to the ST account. 

I'm curious how anyone else might be handling this, or if you've hit any snags I'd like to avoid before implementing option#1. Thank you!

None of this will be necessary if/when Sage allows BT/ST from the Job Billing Entry task... come on, Sage! And if you or your customer would benefit from this feature, please vote for it here: www5.v1ideas.com/.../41497