I've never found another workaround to that issue. What you've described is how I get around it also. That, or crossing fingers that the HSA distribution is less than 7.5% AGI. 😉
*If this (or another answer/reply) solves your problem, please click "Accept as Solution" to get this post out of the "Unanswered" queue of posts.*
