Both will fit. The H8 is about 1.5" longer and a few pounds heavier than the stock H7 OEM Varta battery these cars come equipped with, but both batteries fit perfectly and without modifications in the well. I'd go with the H8 because of the marginally better CA, CCA and reserve capacity numbers over the smaller H7. With these cars, every bit of extra juice helps.
PS: Replacement is easy, but these suckers are heavy to lift in and out of the engine bay. Make sure you wait a good 3-4 minutes before disconnecting the leads to insure all electronic modules go to "sleep" first. Remove the black/negative lead first when you remove the old battery and connect it last when hooking up the new one. Interestates are easy to find from a variety of stores - I purchased my MTP-H8 from a local Firestone tire shop for $150 or so- cheaper than the dealer - but that was 3 years ago and I don't know what they charge for those babies these days.