I don't think anything changes if you're doing it this way. The new rules seem like their aimed at shitcoiners doing all their nutty shenanigans. Moving BTC between your own wallets does not reset cost basis but knowing what purchases are in each UTXO so you can follow FIFO is important.