Here's a twist... (had this idea for a while, not sure if I've shared it.)
Change Luke's name in the OT to Luke Lars. I mean, it's Leia Organa. Why did Owen and Beru keep Luke's last name, especially if he was in danger if anyone knew he was the son of Anakin Skywalker?