I have to commend you. Despite the multitude of folks who chase an aesthetic and don't give much through-thought, you on the other hand have mocked, photoshopped, analyzed, and now are prepared to have professionals perform the critical calculations. Its really great to see someone update these bikes "properly" and get what the want out of it. I doubt this will fall into the "Started, never finished" bin due to lack of commitment.
You will invest far more than the market for this bike will return. BUT, you will have a truly custom bike, that you built, that can be bought, no one else has, and it will still be a blast to own/operate and cheap to repair in 20 years. If I had a hat on, I'd remove it for you-