+1 to everything
rick100 said. This Nexus313 character seldom knows what he's talking about when it comes to selling values on these things and constantly undervalues everyone's shit.
$21k on trade + HST savings towards the M4 is pretty solid, especially given the convenience. As long as the M4 is being obtained at a number you're comfortable with, then go for it.