Brake pad shape

Hi all, I have the mk2 brake conversion to 256mm discs and just trying to figure out the correct shape of pads to get. Seeng two different options, one with the spring at the top and one without, both different profiles. However mine seem to be a combination of both! 

Any help in pointing me in the right direction would be much appreciated. Will be getting Brembo max discs as I've seen these recommended a few times on here.

Well I took a stab and ordered these