It will.
Piper is now almost 6 months and while I am still getting up earlier than I would like to, it is now only once, instead of a few times.
I also only train outside, so that is more difficult, but in the end it works better for me.
I would try withholding water a little before bedtime, it may not help a whole lot because she is still so little, but it may.
I have the same fear as you about bed sleeping, luckily (or unlucky??) I am a very light sleeper, so I feel if she moves or if I was to move on her.
I won't let her sleep next to my BF because he is not a light sleeper and would roll on her if she did.
Good luck!