I went thru this with my Rikki, she was always clipped until I got get and allowed her wings yo grow as I don't believe in clipping. I was at a point of considering a small clip, but was fighting it, she loved her new found freedom. I finally in the advice of a friend, put her in a schedule of allowing her out in the aim, then putting her in her cage around lunch time and allowing get the afternoon time for a nap or just chillin in her cage. I then let her out later in the day. She did really well being in a schedule instead of all free time.
my Amazon will go after people , so whenever I have visitors, I make certain all my birds are in there cages so there is never an opportunity for a bad reaction from my guests when a bird flies on or near them causing a new habit for them to enjoy