I know the feeling. Hopefully with a year you should be good.
Can’t speak to 1/72 but I’d say Eduard for the 1/48 D-model. The Profipak kits come with all the PE but the cockpit is so good in plastic, and you remove so much detail to place the PE, that I honestly think the Weekend kits would be just fine.
Tamiya’s kit is tried-and-true as well but the Eduard has it outclassed in detail and options….and complexity.