Richard Longenecker states the following in connection with the relationship between Acts 15 and Galatians 2.
Richard N. Longenecker, “Acts,” in The Expositor’s Bible Commentary, vol. 10, rev. ed., ed. Tremper Longman III and David E. Garland (Grand Rapids: Zondervan, 2007), 939–40.
Longenecker goes with option 2. I concur.