So, I’ve tried the Berkshire loco as an experiment and the above post is about right - it will negotiate the O31 curve but looks fairly ridiculous.
As this is intended to be an exhibition layout, viewed primarily from one side the plan is to look for more O31 and O54 track, and concentrate the O31 stuff where it is least visible but space saving is most valuable.