Get your taxes done using TurboTax

https://ttlc.intuit.com/community/retirement/discussion/steps-to-manage-401a-after-tax-over-contribu...

There is a related post in this link but the situation is somewhat different. I posted my question to that thread as well.  You can monitor there.  Hopefully we get help form someone who knows.