The Gogo coaching revision makes total sense to me. Stephen gets all the benefits of the Cricket package and can still take some jumping lessons from Brian. In Lee, he gets someone capable of leading his development and being his primary coach for his junior career with lots of focus.
Conceivably, he can switch to Brian after this cycle if he wishes and once he's a full time senior gunning for placement at worlds. At that point, Brian may not have Evgenia, Jason, Yuzu, Javi training there and would have capacity to take on more world elite seniors. Stephen has lots to do until he's at that level. When Beijing ends, Gogolev will be, what, 17? Perfect time to think about that next phase of your career.