Yes, correct, those are the ones!
Also correct, although the 30Q can go higher maybe the VTC6 don’t go to that limit…
These two questions cannot be seen separated in you case. So: which is your flashlight?
Only knowing that we will be able to reply “which is the best for your flashlight”.
Discharge capacity in not the only thing that needs to be taken into account when chosing a battery.
Example:
a) if you want a battery with larger capacity, you’ll go for a Sanyo GA or a Samsung 35E. You can use this in the cases when your flashlight doesn’t need a high discharge cell (ex: a light with a driver that only goes to a certain limit in draning).
b) if you want a battery for high discharge, you’ll go for the Samsung 30Q or the VTC6. You will use these when you have the so-called “hot rods”, like Emisar D4 or something with FET drivers that will draw a high amount of Amps to achieve/deliver top power.