Hello, first post so please forgive me if this isn't the correct place to ask this. I am currently updating our small bathroom. The total bathroom width is a little less than 60". Our current setup is the top picture below. There isn't very much space between the toilet and vanity (about 12" which is below the 15" minimum required) which is how it was originally built.

In order to make more room around the toilet I bought a 24" vanity, which solved the toilet space problem, but created it's own issue. With the vanity in the corner, there is only 12" of space between the center and the wall, which is below the 15" required by code. If I move it over 3" I am ok from the wall to the center of the sink and from the toilet to the vanity, but code also states that there needs to be 4" between the edge of the vanity and the wall. If I move the vanity out 4" I am now below the 15" required from the toilet center to the vanity.

Is there anything I can do to remedy this? I imagine the bathroom passed code when it was constructed.. should I just put another 30" vanity in and get rid of the 24".

Thanks for the help!

Mike