Nope, still planning to continue it.

The safe haven thing should just be a one-time deal of filling out a form and deciding how I want my cost basis assigned to which purchases.

The simplest thing I can figure is look at my current average cost basis and bulk edit all of my buys through the end of this year so that the cost per unit is whatever my average cost basis is.

Starting next year it'll be easy peasy, especially if my sales of btc are limited to the "walled garden" of strike.