I'll suggest Re:coil since you've got a good curl pattern (3a/b) and, if you don't mind products that build up a bit, Tigi's Curls Rock Amplifer (sp?) cocktailed with a light gel. I saw a gal at my salon with 3a curls walk out after using Re:coil and she looked fabulous! Good luck.
2b/3a.