I don’t like a water closet without a sink to use before using the doorknob.
If you can install a recessed mirrored medicine cabinet over each sink in the vanity, each user will have a place to put his/her personal items. I also would use a vanity cabinet which has drawers for each user.
The existing closet seems large enough for supplies and towels.

room measurements would help,

generally, bathroom pieces are standard so make moveable pieces on paper and fit into the puzzle on the correct floor measurements. you'll be able to move them around until you find a fit you love.

It's not looking good for a separate makeup vanity, unless you give up a sink or combine tub & shower.

I like the idea of combining tub and shower? Can you tell more about that?
These are few options that I could think of, any one more better than other?

60"x32"x72" measurements of an average tub/shower combo.

Do you see why I ask for room dimensions?

IMO ther eis no way to help without a to scale floor plan and also any windows , the plumbing if not easily moved and as much info as possible BTW I never like make up counter lower than the rest of the counters just get an adjustable stool if you sit to apply makeup IMO this si best done in a bedroom or even a large walk in claset since storing makeup in a bathroom is never a good idea. Tub / showers are often a great plan in a small space but we need that to scale plan, use graph paper it makes it easier to do scaled floor plans.

Thanks for helpful comments, I am going to try to put the floor plan. We showed to ne contractor and he outrightly rejected the idea of moving shower . Said there is no space and said that vanities can only be in that position. Attaching some pics