I'm now happy with the way everything is working. There are tweaks I could make -- I need to put in place redirects for the old URLs, and I should revisit the collection.xconf and indexing, and there will be more pages that need to be created for the new site -- but it's all basically there, and what we have now could replace the current webapp immediately. Will start that process next week.