you need to make sure you can use the pentatonic correctly before moving on...
If you're messing it up it's prob because you're trying to do things to complicated... or atleast on the edge of your standard and in a pressure situation you're not pulling it off (even standing up and playing can change things)...
It's much better to play things simple and effective and people who are watching will be much more impressed than if you play a so that is 80% technically great and 20% mistakes...
You're best off learning the notes and making sure you're hitting chord tones as they pass... this will make your solos sound a lot more melodic...
Major Pentatonic is the same shape as the minor just your root note is in a different place (obviously this effects the other intervals but the shapes are the same and if you know the notes then again you can still hit the chord tones)
Playing tastfully with pentatonics and playing THROUGH changes sounds much better than mindlessly blasting over the top with modes or harmonic/melodic minors...
This is a good point. As a matter of fact there are many guitar legends who played mostly pentatonic stuff for their whole career. The main problem with that pentatonic sound is that it lacks of half-steps. If you want to go ahead, a good understanding of the major scale, as example, gives instead a better knowledge of the guitar neck. Other scales and modes are easily related to this scale so it's well worth to spend some time on this topic.