Where are the doors?
My gut feeling says knock wall between bathroom and shower and leave toilet separate.
No changing plumbing - take out shower over bath and make it a bath only, then vanity where it is, then shower where it is. Keep toilet separate.
Did I interpret the plan right?