Record SPP Transactions Accurately

Currently have settlement date automation (sync trades) set up for the portfolio but whenever there's an SPP the cash transaction dates do not line up as usually you pay the funds first, then get given an allocation and then the units get settled to you. If I leave it as is, it shows that funds only come out 2 days after the settlement date but that's incorrect. The current workaround is to disable sync trades in the cash account, add the transactions, then re-enable sync trades which is pretty cumbersome. Hoping for a better solution to deal with SPPs!