best of luck to you, thats an area i struggle with. so hope the hard surface modelling works well for you.
the lego mentality i found has helped me if you cant model something on the existing geo the make it on a different mesh then stitch together or keep it as a seperate mesh 