Get your taxes done using TurboTax

I made excess contribution of $460 in HSA and contacted HSA administration to withdraw excess. But by mistake I requested $700. When I checked with the advisor he suggested to add $460 in 2018 returns and rest ($240) in 2019 returns. Is this right approach?
Second, after answering that I will be withdrawing $460 in Turbo Tax, I think it captured that in my W2 total. But advisor walked me through a step of adding  it as Miscellaneous Income, 1099-A, 1099-C. Now I feel like $460 is reflecting twice (Once under W2 and then under Misc Income section). What is the next steps here?