I'm a little confused as to whether or not you have a brake cutoff, but if you do, unplug it and see if the bike works. If it does, it's the brake cutoff that has an issue.
As for the PAS disc, it looks like the shop has it aligned pretty straight but if it is not and the disc is different...