The answer is simple Steve... With stock cables, no risers at all!

The enduro high bar (Renthal 613) is has 30mm more rise than OE and is also 35mm wider. The extra rise and width means they will just about fit with standard cable lengths (with the cables re-routed as you have done) but it'll be tight! You'll end up with about the same rise as you've got at the moment with your risers fitted to the stock bars but they'll be a tad wider. The sweep is less aggressive than the OE bars too which is the main thing that makes them more comfortable from my perspective.

If you just fancy Renthals, then the Enduro Medium (664) has pretty much the same rise and width as stock, but with the same (more ergonomic/nicer sweep of the 613s). These would be a straight swap for your OE bars and you can keep your risers fitted.

__________________