I can totally agree with you, I actually feel that all I do is squirt and never have a g-spot orgasm. I found that if I go to the bathroom before any sort of intercourse (be it solo or with my boyfriend) I will squirt less..not sure why but I do...it makes me more comfortable but makes my boyfriend sad because he loves when I squirt, especially if I am straddling his face for an oral session and I squirt on him...it sounds weird but if you have that kind of guy its actually a VERY big turn on! I also have "special" towels that are only used for when I squirt. Maybe invest in one of those leak proof blankets/throws for your sessions and see if that helps. I am going to invest in one soon to see if it helps or not.
Good luck in your quest though!