Pretty much what I had done; merely got a Krone 24 port patch panel, with 16 for data, and 8 for voice, although I'm using cordless phones now, so ended up just using 2, one for fax, one for voice.
I've sort of gone of VoIP due to poorer call quality, although I still have a free VoIP line from iiNet. Too much hassle for not much savings for the little amount we use the voice line to call out (mainly to receive calls).