Removing automatic restriction cdl

Hello ,
I’m in California and I have my commercial class a license with the fifth wheel restriction, air brake restriction, and the auto only. I took my test with a gooseneck and automatic pickup truck that exceeds 26,001 pounds and the trailer is over 10,000. My other truck is a manual transmision but with my largest horse trailer it puts me at 25,900! My goal is to be allowed to use both my trucks legally to haul my horses.
If I took the full test when I got my CDL in my manual - I’d have the restriction 88 on weight. So I took it in the automatic.
Now the thoughts been in my head I’m still not legal( in a pickup truck which is so silly to me but -).
Yesterday I popped into dmv. They said we’ll get your permit again, take whatever you do in the parking lot ( I assume pre trip) and the road test she said no skills of backing and just bring the tractor.
I explained well it’s a pickup it’s a manual normal pickup. She said okay bring that no trailer needed so we can knock off the auto only restriction.
Went today - I re applied paid the permit fee got my permit ( again lol ) cool. then I asked what test they said drive only. I said I can do this in my manual transmission pickup that I want to be able to haul with and we’ll lot of back and fourth and they said no. Went down to bring a class b 3 axel over 60001 lbs or a truck bus like over 26,001. Cool be super easy to find those in a manual ( I’ve already called all the trucking schools local to me ..).
But now I’ve read that taking a class b ( which I don’t have access to anyways ) would knock down my class a to a b ?!
Does anybody know any way to get around it ? I cannot find a large enough trailer either to do the class A drive test in either. If the lady was correct and just a drive test in a manual with no weight looking at sure would’ve been nice !! I’m have no attention of having air brakes but isn’t everything large enough with air brakes ?!
thanks if anybody has any experience with this !