Is this right:
EW/NW good milk feed
6-7am WU milk feed but not much
10am pre-nap good milk feed
3pm milk feed
BT full milk feed
NF11pm good milk feed
NF 4-5am good milk feed
Looks to me like there are plenty of milk feeds there - looks like 5 or 6 good feeds from what you've said if I understand it correctly - which is totally fine. Although the WU feed is not a full feed LO is getting a pre-WU too so it might be a little time or encouragement to bring those two feeds together into one good one.
A lot can happen in LO world in the space of 6 weeks.
You could post on the BF board with a question specifically about going back to work and needing to move to a bottle/cup/straw for day feeds. You're likely to get more experienced eyes over there.
If, after you return to work you BF morning, BT and NF I would think your LO would be getting enough breast milk, solids dairy does also count towards the 'dairy' need although of course it is not the same as breast milk. The yoghurt and cheeses you are feeding him now already count towards his 'dairy' (FWIW my DS took less milk if I fed him more dairy solids so I cut back on dairy solids and he increased his milk intake again).
Sometimes a LO takes to solids too much too quickly and drop their milk feeds so dramatically where it might be worth decreasing the solids offered but in your LOs case it sounds ok, enough good feeds.
When can solids take over milk?
To answer this. Solids gradually increase to the point of 'taking over' at 12 months but even 1yo (and through childhood) LOs need either a couple of portions of milk or dairy or an alternative. Most people tend to give 1-2 drinks of milk to 1-2yo, either by continuing to BF or bottle feed or switch to cows milk in a bottle or cup but it is very much personal choice if you want to BF or switch to an alternative.
hope this helps