Thanks for the advice guys, I've looked into all those suggested and have found a few frames that I like. I am probably most keen on getting the Pake but they seem to be all soldout online, if anyone knows a store in Melbourne that stocks them then please let me know.
Also looked at a few Masi and Kona complete bikes but they end up more expensive than the Madison and don't look as good either.
I'm not too keen on the look of the Surly or Salsa frames either, call me picky. The Madison wont be in stock for at least a few weeks yet so will try and do some more looking around to see what I can find.