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.
The rabbit from BTC's hat is coming (it's the lightning network). Meanwhile BCH has done exactly nothing to that effect. And no, just increasing the block size limit is not solution, just a patch in the gaping hole. It will also prove deadly mid term.