I just got off the phone with M+ Customer Service and they credited me 1K EQM's and 2K miles for the missing SNA related segments. So that worked out well. In the future, I'll try to avoid doing this again

Getting back to baggage matching, I thought that was only on international flights as well. And RFID would definitely help in this case. I'm sure somebody out there is pursuing this as we speak (or type).