Do i have my calculations right? Volume of Distillate to make water soluble CBD

Hi all,
I wanted to run some math by the smart people here to see if i’m overlooking something or making a wrong assumption when it comes to my math. I’d appreciate any insight people have to this.

I’m trying to make water soluble CBD, and there are 2 "formulas’. One involves 5wt% of CBD distillate and the other 2wt% distillate.

Am i right in thinking that if i want 1500mg of CBD in 30ml of liquid, that i would need around 5.55wt% CBD distillate that is at 90% (903.1mg/g)?

I’ve ran the numbers 3 different ways and it comes to the same, but things can go wrong when you’re using some numbers that are weight and some that are volume in the same calculation.