See if you can find a place that will
allow you to combine your Commercial training with your CFI.
Take your CPL checkride from the right seat, preferably with the same examiner you’ll use for the CFI. Take your rides a week apart so you’ll have time to fix anything that may have been good enough for CPL but not good enough for CFI.