You’re eventually going to pay ordinary income tax on the 401(k) money, so I think you need to either include it in both or exclude it from both rather than treat it as entirely non-taxable as you’ve done above.