Getting started with X-T1 or XPro2?

I'm an experienced enthusiast Canon 5D shooter thinking of making a wholesale switch to the Fuji system.   The 5D is the MkI and is getting super old, plus has front/back focus issues.  I know these questions are subjective but your input would really help.

Priorities to me:

1. Family/kid photos - casual pix + very sharp portraits are important.  My kids are young and run around a lot.
2. Landscapes
3. Astrophotography - I love star trails and milky way stuff

I'd like to get either the XT1 or XPro2 in the next few days but am torn.  I've shot DSLRs for a long time but would love to try the rangefinder style.   I don't need to replace my entire Canon system at once; prefer to get something and 2-3 lenses to try things out first, especially sharpness at the wide to short tele range would be great.

XT1:

- Much cheaper, I can get "newly used" for $750 - that's nearly $1000 off a new XPro2, or one of the nice primes!  There are also deals for newly used XT1s + the kit lens that run just over $1k.

XPro2:

- Can try out "rangefinder" functionality, better sensor.

I'm also torn as to the first lenses to get.  Going to Yellowstone next month so being able to capture great landscapes would be awesome.

Here is a possible combination:

• XT1+ 18-55 kit lens - just over $1000
• 16/1.4 - around $900 - for astro/landscapes/travel
• 35/2 - $400

Total:  ~$2300

if I get an XPro2, and dont' want to spend much more, I'm looking at perhaps 1 lens?  Unless I go the manual focus / adapter + third party lens route?

Advice appreciated thanks!