That would be what I recommended in #13. 
It makes no sense to use a non-5V power supply if you already have the proper 5 V power supply.
Note however that I explained some important things about the layout of the wiring, not quite the way your diagram indicates.