"Shifting when on the larger chain ring was always iffy".

That kind of says a potential component mis-match, but a shop might know better. I doubt the gazillion Fuji Cross bikes out there would have that kind of obvious issue. Shimano makes a 46/36, it's a cross racing crank, but it's an Ultegra 6800 series and runs north of $170 or so. Not an economical solution maybe. Do some research here as well for 46/30 cranks, that's a really nice range. Only nice thing about the Ultegra is, and according to the Shimano compatibility chart, it's designed to work with 5800 series components, so an almost guaranteed solution, if it's the current crank that's the problem.

It gets worse potentially, the Performance mess, as Bicycle Retailer notes that the parent company of Performance - Advanced Sports Enterprises, will be selling the Fuji, Breezer and Kestrel brands. Might affect warranty, but who knows.