It was the coils.
After a lot of switching around it turned out to be both coils.
The bike is running great with the old CDI & the new coils.
Thanks guys for all the help.