Yes, the new law is a pain in the ass and has slowed my trading activity way down but maybe not such a bad thing to HODL until the long term gains kick in.

You may want to check out the CoinTracking program to help
https://cointracking.info?ref=R428630