Jane7 - The best advice will come if you stick a post in the nappies forum, I've had loads of really good and friendly advice from there. I would love to advise you but I haven't had my baby yet either so wouldn't feel confident in giving you specific nappy advice re pre-folds as I don't have any.
However if you're looking for shaped nappies Motherease Sandy's are very popular, they're very absorbant, dry relatively quickly and are easy to get hold of new or 2nd hand. Tots Bots Fluffles are going out of production and are on sale on various websites, they also have good reviews. Both are a shaped nappy that you will need a wrap for.
Motherease Airflow or Riki are the wraps that are most favourably spoken about - airflow moreso because they are just elastic at the top, where as the Riki are velcro, which some people say is very stiff on a newborn's tummy.
Some people buy a super-absorbent nappy for night times as the baby will be going for longer without a change - this doesn't normally matter for a newborn, but may be an issue a bit later on - Ella's House Bumhuggers are talked about alot as a good nighttime nappy.
If you don't fancy nappies that need a nippa then go for anything that says it has 'aplix' (velcro) or 'poppers'.
As for liners - fleece liners will take away the wet and leave a dry surface against your baby's bottom, any poo can't be thrown down the loo before the liner is washed, meaning you will save money, however disposable liners are useful if you're not in to poo shaking!!
I would suggest googling to find a trial service, there's on in my area that I can pay a tenner and get a load of nappies to try for 2 weeks - this way you can see what works and what doesn't - every baby is different and will get on better with a different nappy. If you want to buy something now then just get a couple of each nappy rather than a massive pack.
Also, this link is great for a description of different types of nappy