Thanks for the replies all.
I ended up going with the original build and it's worked a charm.
I had to have an optical drive to install Windows. Keyboard/mouse/monitor was already present.
Those combo mobo/cpu look like a really great idea! I had a look and asked about in the Aussie stores here, but nobody stocked them unfortunately. They would have worked wonders otherwise!
Thanks again folks.