The next bull market seems elusive, but I believe after the halving next year we'll see some significant strides towards the bull market.
Like you've said, having a plan, sticking to it and never giving in to any distraction is way to basically prepare.