Always Modify before you fix - What could go wrong when you have all these new shiny parts??
Sizing advice;
These fit quite tight, even compared to size guide - if in doubt go a size bigger.