Cranking VE should be adjusted so that with cranking enrichment 100% @ 80c the engine would start nicely. I don't understand why you changed that cranking enrichment @ 20c point - it's clearly not enough, and you have problems with hot engine, not barely warm.
Warmup enrichment needs to be tuned, or, as a stop gap measure, added some enrichment in points where needed, NOT all over. How to tune warmup enrichment - enable your wideband oxygen sensor to start upon ECU startup - in case your oxygen sensor is being powered by fuel pump relay, not directly from ignition, some fiddling with output configuration would be needed, in order to keep fuel pump on to heat oxygen sensor and to keep it running afterwards - so you get your sensor hot and running with engine off, and open warm up enrichment curve - then start your engine and adjust the curve so that you would get target lambda at all temperatures till it's hot - of course, if VE table isn't really correct, that won't be very precise.
As a side note, this is how does both of these curves looks like for my engine, just for reference - no, I'm not experienced tuner, my level is only slightly above yours, and my engine is VW 2.0 8v [but the physics concerning these curves aren't much different between our engines], but car is my daily, with VEMS for more than year, and I live in colder climate than you [apparently] - warmup enrichment curve was tuned last winter, when there was -15c outside , although I'm going to retune it today, as the engine is now different - cranking enrichment curve, well, the 30c and 80c values are there for a long time, but -40c and 0c values I am upping slowly for a last month; I guess 0c will end up somerhwere around PRJ mentioned 330% or so.