Yes pot size should be bigger. You will want to start your autos in the same pot they will finish in as they don't transplant very well. A 5 gallon or 7 gallon would be ideal.
At this point I would let it ride in the pot its in. As far as trimming, that would be fine. Make sure to only remove fan leaves that will allow light to hit tops that are blocked from light.