Move pending forward htlc construction into method

In upcoming blinded paths work, this method will grow to handle blinded
forwards.

Also since we're here, get rid of some indentation in decode_update_add_htlc_onion

Author: valentinewallace