Johnstone,
Everything you mentioned sounds good to me.

Other options are to wear a onesie or diaper suspenders. If properly fitted, these may provide more lift to the cloth diaper. However, compression shorts will do more to smooth out the bulk. It is all a matter of choice. Upon occasion I have worn a combination of the methods, such as onesie plus compression shorts or diaper suspenders.
--John