A week ago: engine cut out while on the highway...

pushed it to nearest exit and parking lot. Called dealer and he came to pick up the bike and me. Dropped me at doorstep and took bike for repairs (top service!). Called next day: fuse blown from fuel pump. Cause unknown...
Picked it up and drove it back home. Next sunday took it out for a spin... lasted 30yards... engine cut out again.
Started trouble shootin: suspected the fuel pump to be shot somehow. Exchanged it for the MT-03 (my second bike) fuel pump: fuse still blows...
Took a day off to do some serious digging. Fuse still blows with disconnected fuel pump, fuel level sensor, fuel injector, ignition coil, rectifier...
... my conclusion: short circuit somewhere in the cabling...
Had my dealer picking it up for a final attempt. Advised him to spent max. 4 hours and then order a new cable loom...
Any other suggestions?
HJ