I think I'll do the latter and just skip the second check. It takes me about an hour to enter all charitable contributions in schedule A. Thanks for testing the workaround.
