I'd like to pick out one or two observation's here. First you can safely put more than 3cc into your glutes, use a 21g as it's time consuming with anything smaller.
Shooting shoulder's keep it below 2cc, biceps 1-2cc depending. If it's your first time 1cc into the biceps is enough.
While I won't say your wrong about mixing water and oil, I have and everyone I know does too. Given a good shake you'll just be left with lots of tiny bubbles. It has never caused a problem here.

Lots of great into there.

Bouncer