Sounds good to me. SnapMap stuff felt like amateur hour to me, and post-launch singleplayer DLC is something I'll absolutely eat up.
Now the question is which version to buy. Switch for motion assisted aiming and portability or Xbox One X for oooo-aaaah visuals? Screw it. I'll buy both.