Ok, worry is over now, after enough turning the engine everything eventually lined up correctly. However, my main concern now is that the headgasket is knackered, the reason for doing this work was because the car overheated (needed new water pump). The oil is a kind of coffee colour so i'm pretty sure it's gone, will drive it a bit this week to make sure, but it certainly looks like it'll be going on ebay for spares or repair soon.
Oh well.