Washable nappies every time.
My experience is (ever so) slightly out of date (eldest is 28), and we only had terry squares, none of these fancy shaped modern things.
As I think you mentioned, a disposable liner makes life dead easy – just tip the solids/liner straight down the loo, then nappy in bucket. When the bucket's full just bung 'em in the washer – what could be simpler?