Trevanant would be a good addition, or another budget option would be Pinsir (SM6) - Roof fling can be a great stall move while you load up your golisopods.
If you are dropping the Victreebel line, then FoGP is not necessary since Goli and Trev are Stage 1's. you could fill the holes left from...