Hi Darren,
Normally I would recommend placing all your lovely additions on top of the soil but this may make the level too high, especially for tomatoes and cucumber. So removing some soil from the greenhouse sounds worthwhile, and all the proposed additions are good except I would keep leaf mould for outdoor use as it is less full of nutrients than compost and manure. Tamp down the deep layer of organic matter to make it form before planting.
You should have less watering to do than with grow bags.