Fix attached laundry room roof framing
Your Option 2 is still not going to be a really great solution. If you are going to lay the new rafters on top of the existing rafters and existing roof sheathing you will need to taper the upper rafters as shown below. This way there can be a smooth transition of the roofing materials from the existing roof down onto the new extension rafters. 



Ideally the solution would have the full width of the new rafters up above the double top plate of the original wall but full width out somewhere along the old rafter tails is going to be workable as well. Overall this will be way better than the hack job done for the original build.