I've collected and owned a very large number of pre WWI era Marlin lever actions, and Ballard single shots for over 40 years now, and the 336 stocks have always put me off due to their bulbous crude shapes compared to early Marlins. Your newly shaped stock is as good as it gets, and really enhances the looks of the 336!
Can't wait to see what you do with the forearm! I assume it having a barrel band currently that it's a carbine. Wonder what the "1885 forend cap" looks like? Why not use a 336 rifle forend cap? Or did you maybe mean an 1886 forend cap?