Completely agree with the structure of your take on the act flow.
It is a shame CDPR cut out most of that Act 1 content just a year before release. As I recall, it was intended to be just like you described, doing gigs, rising through the ranks of mercs, hanging out with Jackie a lot more, all...