With that shorter column of the non-XL you should be able to get back to a 21X enlargement of the horizontal dimension on the baseboard with a 40mm wide-angle lens designed for big enlargements. What is difficult to predict without having the enlarger in-hand is the distance from the center of the projection to the column. That will limit the maximum height of the biggest print you can make. That is something to consider also, even when mounting the enlarger on a wall with a drop table. Now you see why some enlargers have the forward slanted column (See Mick's post above also).
Well, this was exactly my concern. Whether the column would move into the image by a 21x enlargement.