...there is a wiring loom that if I tapped it the battery light went on/off but the engine warning light stayed on. Anyone seen this or am I just being unlucky?
Don't worry Rus, it could be something real trivial like a loose wiring which caused the engine light to come on, did the engine lose power when the engine light came on? The chances are when you start her up again, everything will be back to normal.
BTW where about do you based, and which dealer did you buy it from?