After much searching I finally found the right tool for the job. CoinTracking is an excellent full featured app. Trades are easy to import and it has several levels including free!
Click here to get 10% off https://cointracking.info?ref=R130242
Besides a fancy portfolio app you also need to keep your coins safe. The best method is a hardware wallet. I like the Ledger nano S, you can pick it up from Amazon or directly from Ledger
DO NOT purchase a used hardware wallet and I would strongly recommend against using eBay as well. People have lost all their coins due to hacked wallets being sold as new!