1) the Catholic answer is both/and, not either/or.

2) in the Paradiso, Dante describes a Heaven where the saints dance an intricate dance of joy as they delighted in the face of God. The dance is tightly choreographed, an organized faith, even if we strain ourselves if we try to comprehend the pattern. It looks dis organized to us, but God may see something different.