So, we're safely ensconced in our new home. Sorry it took a while, it was quite an interesting challenge merging databases and code to arrive at this final version.
There aren't a huge amount of changes; I've tried to re-engineer the homepage a bit, so that more emphasis is given over to your content. It might take some tweaking to get this looking and working perfectly. Elsewhere I've mostly updated some code, fixed a few things, and tidied up.
Please let me know ASAP if you encounter any problems