I had to make the same choice last year. I got the Q5 PHEV. I have no regrets. I get between 30-35 miles of electric range. It is what I need for my daily driving.
The extra weight and space it takes up might not be worth it for everyday driving. Do it only if you are doing a lot of off-roading or traveling in remote areas. I think all you need is a tire repair kit and a compressor.