Probably the best way to go. Win win situation either way. And I'm not even sure if I'm getting any Bitcoin Gold because I didn't want to change wallets. The lack of replay protection made me, a somewhat risky guy when it comes to investing, being doubtful whether I'd lose my BTC or not so I decided to not even bother with Gold. And it's being dumped hard so it'll eventually disappear.
What do you think it will happen with the Segwit2x btw?