I'm glad your doctor was so thorough, but I honestly think you need to make an appointment with a GYN/ONC. Please understand I'm not trying to scare you. But if you have glandular involvement, somebody else should further assess you to find out why it has shown up on your PAP smear, again. Considering your history, did the doctor also do an ECC, during the follow-up PAP smear?
In addition, insist on getting an HPV DNA test. Roche has one, called AMPLICOR. It will tell you which strain(s) you have. If it's one of the more aggressive strains, you can use this information to create a plan to boost your immune system. I can give you links if you want them, as there are a number of women who have done that. The tricky part is that insurance companies don't want to pay for it. So, your doctor may not have it. Or, the doctor can only do it if you know about it and ask for it. Or, you may have to go to a teaching hospital. Another option is to call one of the labs and ask them which HPV DNA tests they use. Then you can call the company directly to have it delivered. Bear in mind, it could cost money. But for me, it was worth having it done. (The doctor was associated with a teaching hospital, but I had to ask for it.)