I prefer 1a. You may well hear native speakers using 1b, however, because people do not always bother to use the past perfect when arguably they strictly should. I prefer 2b.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.