Thanks for the response. Interestingly, the K-1 in 2017 and before reported interest income on line 5 but since then they have put in line 11, code I as noted. Also they don't break out US government interest from other interest which would be helpful for the state return. US just means originated in the US vs. foreign.
I think your proposed netting of income and expense is a good solution.
