RE: flying away and landing
You have already done the best thing that you can do to avoid the problem you are describing.... You are aware of it. Just keep honing your awareness and working on what you know you have to do to fly back to / toward yourself. As you are aware of the landing problem, you will start flying the crosswind leg a little farther toward yourself before you start the final turn. Eventually you will pick out an object in the distance from where you are standing to begin your lineup to the runway, and the altitude that you want to use to properly slow for landing. Then, you will start recognising what your aircraft should look like while you are makeing a proper approach, and you will use this to help line up on any runway you get ready to land at. I took a while to get used to where I had to place my plane to line up with the approximate center of my runway. I tended to land to the far edge all the time. Just for fun, I let my son land once without warning him that I knew he was coming in short, and let him land in the tall weeds at the south edge of the runway one day. He learned from that one experience more closely how to judge where the plane really was on final.