Wow that was quick... Thank you it seems you have properly identified it. So did I get ripped off? As you can see a few parts have been swapped...

Thank you again much appreciated