First, your North Fork map between the North Fork cutoff and Lower Boy Scout Lake:

Get rid of that track that zig zags all over the place. The gps unit was obviously picking up false locations. The two better tracks do in fact cross the creek and use the south side. This time of year the creek will be very low, so that route will be easiest. Staying on the north side, involving the elephant ear, is a little more tricky to follow.
The foxtail pine is exactly where you describe.
The waterfall is right where you climb up to the foxtail pine. It may be dry this late in the year.