Firstly, if you're that worried you have schizophrenia, stop by schizophrenia.com and take the screening test they have. There's even a printable version you can take with you to your doc.
As for the bipolar diagnosis, there are several types; mania is not as severe in all of them. "I go out and laugh and carry on with my friends but it doesn't feel like me doing it." That can be a symptom of bipolar disorder in itself, it's called depersonalization.
This is complicated by the fact that bipolar and schizophrenia are sometimes misdiagnosed as the other. Keep a journal of all this, and bring it with you to your next doc visit--the more detail you can provide him, the better off you'll be as far as receiving a correct diagnosis (please note I'm not saying your doc is necessarily wrong, just trying to address your concerns).