You could just get your current setup engineered by adding what you need and fixing up wiring etc.
Grey area on the smallport swap, I didn't have issues in Vic rego'ing mine with a bigport but others have been defected etc.
Feel like this has been covered so many times, have you checked your local NSW modification guidelines?