I had a severely swirled/scratched 2000 BMW M5 Jet Black to do this past weekend, and I tried the new Midnight Sun Batch 24 over 2 coats of Blackfire Wed Diamond that had over 24 hours of curing time before the Midnight Sun was applied.
Maybe its because I have not used a carnauba wax in years...