I suggest 'Astronaut'.
I'm fine with 'space tourist' or 'suborbital space passenger' or something for the rest, recognizing that they still receive some level of training and some level of fitness is required. Just not at the 'right stuff' level of the Astronaut corp.
Most of the people who went to space in the shuttle couldn't fly the shuttle. They're all astronauts, but they aren't all shuttle pilots or commanders.
US miltary and NASA define astronauts as those that have flown at 50 miles or higher.