At fisrt IMO you should use the .xml! The settings from fisher are well set and i think will fix your problems with your build.
Check if you ticked on combat settings "wait for CoE" in order to be synchronized with Bombardment.
CDR 61.5% is required. If you have more it's ok.
For me SVN...