Right, got started on the list I posted earlier, have removed the drill and Blue ESC's and Ewan tells me that the Gimson motors should arrive tomorrow . Also awaiting a set of Robochallenge wheels as I was fairly sure the Gimsons were too big when I tried them on the drill motors, but I still have a set so will be giving both of them a try at some point before reassembling it all again.

Few photos so far:

Rear view with polycarb backplate off:



Detached from most of the rest of the robot and baseplate to make it easier to get the motors out:


Offending articles removed: