The only question is BTC or BCH.
Haven't you still answered that one?
Like I said earlier, I hold 3 BCH for every BTC I hold. So I'm leaning towards BCH but acknowledge that BTC may pull a rabbit from the hat and solve the block size limit problem.
There is no problem to be solved. Bitcoin is not broken.