Nice job @Sergio! Hopefully that approach will serve you well. Even if you don’t stick with that approach in the long run, I think it’s a valuable git experience to have under your belt.
I’m attracted to the @hooverlunch git subtree approach mentioned in that thread, but I haven’t tried it yet. It looks like once it is set up, maybe it would be easier to maintain. Some people also find cherry-picking useful for their needs.