It sounds as if your leg extension, stand over height and arm position are fine. I would think that all you need would be a little tweaking - like possibly lowering or raising the handlebars. Another tweak that works well is changing the distance of the handlebars from the seat.
Now if you were buying a bike new, you would get the "right" size. But you are in a strange situation. You have long arms and long legs, so a standard fit might not work that well. Remember, the basic fit suggestions usually assume a pretty standard body.
There are some sites on the web where you can enter in your personal dimensions. The fit calculator will kick out an optimized fit that works pretty well.