Yes, something with hold might help (although the Giovanni foam does work for me as hold, but my hair is a bit atypical, I think, getting and maintaining hold doesn't require heavy duty stuff for me). Also focusing on technique, praying hand followed by scrunching seems the best place to start.
I'd suggest since you're wavy not to do CGM to the letter and would use a sulphate free shampoo and potentially not such an emollient heavy conditioner (although I can't tell, is your hair on the coarser side?). And are you clarifying at all, wavy hair gets build up a lot quicker, generally?
I'd also suggest getting a Denman brush since you have such a variety of curl types, that'll get it to act as somewhat similar instead of all over the place.
As for smooth sorry
I don't think naturally wavy/curly hair is ever absolutely smooth, there will always be some frizz/flyaways and getting very close to it seems to be something you achieve very much further down the line so I wouldn't let it distract you from the results you're getting now.
Update from my last wash day, I don't think the Treluxe gel added much beyond a tighter curl pattern but it was not worth the extra drying time
I have a picture somewhere, I'll dig later.