I think the thing to do would be to remove all the old roofing down to the decking. If the decking is in good condition, just cut wedged-shaped sleepers out of 2 X 4s. Nail these over the decking at the location of the original rafters and re-deck on top of these, giving you a roof pitched away from the house. Be sure to flash properly where the new roofline meets the existing house.