I think your solution to prevent the initial flicker is perfect.
Check this post if you want to learn how to integrate it.
It seems I overestimated the effort (Un)Fortunately I am not invoicing a client for this.
