You are already contemplating replacing two parts, go ahead and buy the complete US furniture kit for just a little more, and then add a RSA trigger you will be glad you did. The RSA trigger is a great upgrade, one of the few that are truly worth thier cost, and should be considered a wise upgrade even if US parts count isn't a consideration. That is just my opinion, take it for waht is is worth (not much)!
Edited to add: The RSA trigger group costs about $85 and counts as three parts, the US furniture set (at least in black plastic from K-var) costs about $85. It wouldn't be exactly cheap, but it is much less than buying a new rifle, and would prevent you from having to worry about commiting any felonies just to have a rifle the way it was meant to look. I went through the same process with a post ban thumbhole Hungarian, I had the parts for months before I could bring myself to make such a drastic change to a rifle I adored, but once I finally switched the parts and took it to the range I was very pleased, I could have saved forty bucks and went with a less expensive trigger group but I am very glad I didn't the trigger is that good once you get it set the way you like it.