You're doing very well- it took me ages to get that far! Bumgenius have and AIO and a one size pocket nappy.

Liners are probably personal choice- I don't use them and just wash then sun our nappy to remove the poo stains. But then I'm dealing with BF poos so I think for older children it's a different matter. You can get single use or washable liners.