Exact same issue for me. And like you, do not want to fudge as it would create inconsistency with Federal return and is manipulating the 1099-B data.
