Fixing the speed doesn't solve the problem, unfortunately.

So currently I'd have to choose between fixed WAN port or Samba etc.

Will this change in the future. i.e. will the WAN fixes be incorporated into the samba etc. firmware?