looking good mate!!
As suggested in the 101 thread, you are right, and this will avoid the chafe when moving.
About the inner clothes,for you to have an idea, what I have seen in the forum is the following recommendations :
https://www.amazon.com/gp/product/B07HXPKQDK/ref=ox_sc_saved_title_3?smid=A2Q6XV9HQ2RH17&psc=1
https://www.amazon.com/gp/product/B07ML2YRPF/ref=ox_sc_saved_title_4?smid=A2Q6XV9HQ2RH17&psc=1
Cheers