The energy of a photon is related to its frequency, like you said. It's actually the frequency multiplied by Planck's constant. So like you said, the higher the frequency the higher the energy.
The amplitude is related to the intensity of the wave, which for visible little would be the brightness. For sound waves amplitude is the volume of the wave.