If the voltage regulator is rated appropriately to supply the required current why would you need to use diodes or a buck converter ?
One answer would be in order to avoid wasting power by turning it into heat, so avoid that by replacing the voltage regulator with a buck converter with an appropriate current rating
Will this be in an enclosure?
If yes, what kind of ventilation will you have?
What is the maximum ambient temperature?
Was the PCB designed with the proper AMS1117 footprint and copper area for heatsinking?
Let's do a simple worst case example and see how much heat the 1117 can dissipate.
Max ambient temperature (inside your enclosure): 35° C
Max thermal resistance of 1117: 90°C/W
Max junction temperature: 125°C but lets keep it cool so use 100°C
Max power the IC can dissipate = (100-35)/90 = 0.72W
Your actual power dissipation = (6-3.3) x 0.2 =0.54W
So you should be OK in this particular case, provided there is some kind of air circulation around the IC and there are no other heat sources on the PCB
There is information in the data sheet about the copper area.
If you make the area at least 10mm x 10mm and the board is at least 50mm x 50mm with some copper area on the bottom, then the thermal resistance will be around 80°C. The bigger the copper area the better and the bigger the PCB the better, to a limit.
I usally make a usage GND-Copper-Field in the back. Maybe I could make a "drill-hole" which connects to the back-Copper-field. The filed is 100x120mm big. And also one the top site (10x10mm) which I can use as soldering point for the AMS-1117. Like you see on the photo...