I would also suggest pre-cal, or possibly Algebra III/Trig (might be redundant for you). It's not really the pre-req for calculus, as its name implies, but it'll teach you a hodge-podge of skills that will be useful in later courses (calc included). I never had any significant trig before pre-cal. My assumption is that the course will use a lot of trig, but won't go too far in depth. What you've had sounds like it should be sufficient. A common math path is pre-algebra--algebra--geometry--algebra II--pre-cal--calculus (and then it really becomes a little less linear).
Geometry to calc is just too big of a jump, in my opinion, especially if math makes you nervous. Algebra III/Trig might bore you (or it might be a more advanced algebra, which would be too far down the line...you'd have to judge from the course-number and description). Pre-cal should be just right, even if it's not your own viable option.
Plus, it's fun
![bbtitle]](/images/misc/cc_logo.gif){kind=logo}
