I addressed it by cutting back. I have 2 aerial BRV moves and 1 ground BRV. 2 Ground HP moves and NO Aerial HP. I use No Assist Lock and Riposte as my only 2 special moves (and EXP>HP since it's 0 still when mastered). From there, I just customize as needed. I use controlled recovery as my only real additional move to the default ones.
Out of all of FC's advantages, indeed I would say CP is his weak link, but he's still very powerful overall.