Cabinet Choice Dilemma

Hey all, 

First time posting here.

I'm redesigning a kitchen for an apartment rental and, against a very tight wall, I was going to put a corner sink (due to piping, this was the only option) and next to the corner sink base, I was going to put a 24" dishwasher. Sadly, after re-measuring, a 24" won't fit (it's 23 5/8") so I'm swapping it with a 21" base cabinet.

My dilemma is what kind of wall cabinet do I put above it?

The cabinet salesman said my two options are these:

1. A 21" wall cabinet with a similar filler to the cabinet below to keep it symmetrical.

Problem: it's a one door cabinet.

2. A two door 24" wall cabinet with a filler strip to the right of it so the right cabinet door can open properly which would look a lot nicer.

Problem: it makes it look asymmetrical. 

I've attached a crude drawing I made earlier in this design process to help you visualize it. The space above the sink is going to be shelves and of course, I'm not putting the dishwasher as the picture suggests.

Any thoughts or opinions are appreciated.