I don't usually recommend items, but this is a "no-brainer":
The Dovo would be your choice. The Wapi has the metal scales. Most of us replace the scales with a material which is lighter, thus providing a much better balanced instrument. You will want to do this, and that would be an extra expense plus your time and energy.
The Dovo through Straight Razor Designs will come shave ready. This is a big one. You will need to get your razor sharpened by one of the honmeisters, which will cost at least $20.00 plus the trouble and the time to wait for it's return..
You may, also say the Dovo could be a better shaver. I realize that is a subjective thing to say, but at the least, the Dovo would also carry a better resale value........
Enough said,
The Dovo!
* I would not recommend the Dovo Strop. Check out Tony Miller's strops at The Well Shaved Gentleman. Most everybody here knows that his strops are your best buy for the product.