I wouldn't say 'screwed' but no worries bro.....what has happened, has happened. 
Cleaner waxes are only to be used occasionally as an All In One meaning it does cleaning + polishing(if the wax has polishing agents) + protection. Black wax has polishing agents. People who barely have time for all the main steps(claying + compounding + polishing etc) use a cleaner wax or AIO which saves the time for doing all those steps separately. Where one would first clay the whole car, then compound it and finally polish it the time saving alternative would be to use an AIO product that does most of the steps in far less time. Then to maintain the clean paint surface finishing waxes(also called pure waxes) are used which have no cleaners and offer only protection and looks depending on type of wax used. If the paint maintained by pure waxes or sealants then you will only need to do the cleaning step once or twice a year to remove contaminants which are not removed by washing.
Now, here's something i need to ask you: what kind of look would you prefer ? A warm, glossy look which shows the depth in color or a flat mirror like shine and crisp reflections. Carnauba waxes give a warm glossy look and sealants give a mirror like shine. Sealants do have more durability than carnauba waxes but still what do you want?
Sealants:
Meguiar's #21 Synthetic Sealant
Meguiar's Ultimate wax
Mother's FX Synwax
3m Performance Finish
Out of these i prefer 3m pf due to its good durability and price.
Carnauba waxes:
Meguiar's #26
Meguiar's Gold Class
Mothers Step 3
Turtle wax Platinum series ultra gloss paste
Search your market and buy what you like or what fits your budget.
