Like ema101 said there's sooo much more to discover than just terries with a pin (although I know some people still swear by them).
When it comes to 2 parts you could still try fitted nappies as these come with aplix / snaps fastenings (or you can use a nappy nippa but the terries experience might have put you off those?). Fitted nappies come in several different materials too, not just cotton terry, so you might find Microfibre, bamboo or hemp nappies better... all have their pros and cons and I'm sure there's probably plenty of other options I haven't discovered yet (for what it's worth I like bamboo and hemp).
You can also get gorgeous prints for your covers too (I love Blueberry wraps but there are so many to choose from, I often hear people raving about Airflow Rikkis too).
I am yet to really try wool but that's going to be my next bit of cloth nappy fun
I don't have a tumble drier so I also find pocket nappies really useful. These are where you have the waterproof shell (mine are PLU and then fleece lined) and you 'stuff' them with absorbent inserts / boosters. You can work out what type of inserts and how many work best for your baby and then you're away. These mean you only have the one nappy to put on baby rather than nappy and a wrap (iyswim) which is really handy especially when out. If you've got a tumble drier you might even want a few all-in-ones, which are basically a pocket nappy that doesn't need stuffing as all the absorbency is already sewn in.
Anyway, I could go on but I'm sure you'd much rather be nappy hunting than reading my drivel... Enjoy and let us know how you get on