Higher-rank graphs form a powerful framework for studying (C*-)algebras. As part of an ongoing effort to find groupoid models for C*-algebras of nonfinitely aligned higher-rank graphs, we define the finitely aligned 'part' of any higher-rank graph, characterising which cylinder sets in the classical path space of a higher-rank graph are compact. We use this to construct path and boundary-path groupoids that are ample and Hausdorff, and we give a sufficient condition for their amenability.