About the lug setup, a loose loop of line will definitely work to keep the yard close to the mast as Don suggests. Other traditional solutions include adding parrell beads, or using a wooden or iron hoop.
I use the "Storer loop" with a hook lashed to the yard. It's very quick to rig and derig. The halyard comes back from the throat end of the yard, passes around the mast opposite the yard (not really a wrap) and catches the hook on the aft side of the mast, then up to the top of the mast. When I derig, I leave the halyard tied to the end of the yard. I only remove the halyard from the hook, loosen the downhaul, and bundle the boom, sail and yard. Next the mast comes down and -- done.
As Don said, try stuff and see what works for you. Keep up the good work!
Bob