I had grabbed this before but did not even think about it afterwards. I used the CC3 based one which seems "off" to me, much like the one in LBB supplement 4.
Working this up in AutoCAD now.
I am toying strongly with the idea of omitting the bow cargo bay door at this stage, however there is an option I want to try first that allows for full crew staterooms on the upper deck and the "working" area abaft the bridge.
What I did do is a rough per tonne calculation on both the upper and lower decks with the deckplan I had and that tallies just over 400T. Interesting...