I thought it would make sense to change the first button on the B row (D#3/G#3) to C3/F3.
It does. I have a B/C set up in exactly this way, for the same purpose as you.
But now I'm confused about playing in F on the B/C. The F-scale in the lower octave doesn't use the same fingering as the G-scale on the C#/D with 21 keys and a D3/G3 as first button on the C# row.
Yes it does. Or it should. If it doesn't, your B/C must be set up in a nonstandard way. I have heard of cases of semitone boxes being set up with "accidentals" at the bottom of each row. Obviously by someone who didn't understand how they are used.
Peering at these diagrams, am I seeing things double? Or is it that not all keys/scales can be playing with exactly the same fingering C#/D-style on a B/C?
Exactly the same fingering can be used, coming out a tone lower on the B/C in every case.
Where do things go wonky on your B/C? E.g., playing what tune, and where in the tune? If it has some "wrong notes", this should pinpoint where.