Here is what I hope to be the final layout.
That looks fine. Note the tub trap arm extends from the tub trap outlet to that vertical wye where it joins the lav drain as it turns horizontal. It's a little odd that your tub trap arm increases in size, but fine, particularly as long as the drain center line falls no more than one pipe diameter based on the trap size.
One of the two lavs on the left is actually a bar sink upstairs on the wall adjoining one of the bathrooms. From what I read it the wet venting has to include only bathroom group fixtures so moved shower drain over to main line instead of wc arm.
That is correct that wet venting has to include only bathroom group fixtures. So your options are to move the shower as you did, or to put the bar sink on a separate vertical drain (with separate vertical vent, although the vents can combine within the wall at any elevation at least 6" above both sink flood rims). Then the bar sink drain could join the kitchen sink drain, but that bar/kitchen drain would need to be kept separate from the lav drain until after the shower drain joins the lav.
Either way is fine, just wanted to throw out another option.
Cheers, Wayne