Looks like you have your bases covered.? I built a Tamiya kit 30+ years ago, the one with the battery powered motor (and only survivor from my youth). The motor still works and the doors seem to fit better than the Aoshima kit.
I would definitely build another Countach - might be worth while looking into one of the Enthusiast kits.?