Your current rig is exactly how my Mac 26S was set up when I got it (except for the boom rotation mod). The hitch pin in the boom (just under those shackles) would pass through a ring at the tack of the sail to hold it in place. I did not like that arrangement much because the tack would angle out from the mast more the the rest of the sail above it. It probably did not significantly affect the performance of the sail, but I didn't like the look of it, so I just lashed the tack ring to the mast instead. I have re-rigged with the newer boom end plate, but that is not really necessary.
I would recommend using a heftier rope for the outhaul, and replace any galvanized or rusting hardware with stainless steel. You might want to install a camcleat or clamcleat at that end of the boom to allow tweaking of the outhaul tension since your main is loose-footed. From what I can see of the mainsail it is fairly new. Nice.