Wanting to Get Tested

So I am not diagnosed with PCOS but I’m concerned I might have it. Since puberty I’ve had some hirsutism. I’d put it on the mild end but I’m removing hair (upper lip, chin, nipples, happy trail) pretty much daily. I’ve always figured I was just hairy but no one in my family is this hairy. I started reading Taking Charge of Your Fertility when I realized how serious PCOS could be. I want to seek testing for it now to rule it out.

I should note that I don’t fit the usual profile other than being extra hairy. My periods happen about every 31 days, varying about 4 days. Occasionally, I’ll have a cycle that lasts super long every couple of years. Since charting my cycles to try to conceive, I’ve noticed a short luteal phase of about 10 days. I appear to ovulate normally. Last cycle I tracked my CM and it had the normal progression through the cycle. This cycle I also tracked BBT and I get the obvious thermal shift after ovulation. I also get ovulation pains. I’m also getting LH surges around when I think I’m ovulating from OPK tests. I’m also very much average for my body weight. I grew up underweight but moved into average when I reached adulthood.

Do you think I’m just being paranoid? I’ve got an annual checkup in May with my primary care doctor. Should I bring it up? Will she order testing or refer me to another doctor?

ETA: the hair is dark and coarse but the areas affected aren’t widespread.