Hey dude! First of all, I still get morning erections as well, but its mostly a natural reaction of pressure on the prostate from the bladder. Once you've taken a piss (run some cold water on your dick first if it won't go down a bit in the bathroom) it will usually go away pretty quick. Try not drinking anything 3 hours or so before going to bed and see if the morning boners still come round.
Secondly, everybody's reboot is different just as every person is different! Usually it seems to depend on how long and how heavy your use has been. Luckily you're young and have under 5 years of use, so it should be quicker for you. After that I'd say its how well you do your reboot. Stay 100% PMO free, avoid sexual fantasies, even semi-nude pics (i.e girls in bikinis etc). Let your brain rest from all that so it can re-wire!
Give it at least 90 or 120 days before even attempting to masturbate again, if possible, wait until you're with a real live girl you're attracted to in more than just a physical way!
As for your penis surgery... I guess it depends on what kind of surgery you're having? Your penis isn't the problem when it comes to losing erections etc, its your brain! Its been trained to only get it up for porn or when you're giving yourself the "death grip" wank.