It should be relatively easy to add slightly angled connectors. It should be also not hard to make the key PCBs non-square.