The backdoor rollover only really works if you have no basis in the traditional IRA.
In your situation if you make a non-deductible IRA contribution you add basis to the equation so now a form 8606 is required because only a portion of the basis can be used thus the rollover will be only partially tax free since you cannot just roll the new contribution.
