That's a good point. Indian Wells looks to be even farther from San Diego than Huntington Beach, and it's about as far as I would likely want to drive. That said, if it's worth the trek, I wouldn't mind.
One possibility would be San Diego (4 days) -> Huntington Beach or Indian Wells (2 days) -> Aviara (2 days). The possible advantage of moving twice in the last four days would be the change of scenery, but I'm not sure if I'm over thinking it...