H7 are indeed the right ones!
Fitting is a piece of pi$$! Remove the ruber cover from the back of the headlight, twist the bulb holder, pull out and replace bulbs!
The sidelight bulbs are a bit trickier, same process but the bulb holder just pulls out. You will need to jiggle them a bit as they don't like to come out first time around! Take your watch off too as it's a bit tight on the N/S headlight!