Embarrassingly, after weeks of deliberation and searching, the exact same problem was raised on this very forum a couple of days ago...
http://www.diynot.com/forums/floors-stairs-lofts/parquet-and-not-square-room.373593/
FWIW, I'm going to look at laying the border blocks perpendicular to...