Another option if you would like more privacy for the toilet is you could enclosed the toilet and vanity. However the vanity would be 36 in. wide instead of 40 in. Also, you would need a pocket door 24 in. wide. I believe a 26 in. door would probably fit except that a 26 in. door is not standard and you would need a special order for that door.
Q