I've just had a thought after reading this!
I hadn't read about AP mode, but did read about the second suggestion you made.
I have done all steps you suggested, setting up the BT homehub outside of the other homehubs ip range. Didn't consider that I've actually brought this home (Setting up...