Sound like a plan. One more note, though: You can buy tokens at the SEPTA sales window in 30th Street Station (same as Amtrak's station, just different area), or via automated machines in the 30th Street Station of the Market-Frankford Line, which is located outside of the main 30th Street Station. Same thing goes for Suburban Station.

And SEPTA is currently working to integrate a fare card system. They had previously promised it by Jan 1, 2014, but have fell way behind (not surprisingly). I'm not sure if the new system is actually the key to end our complaining, but it will certainly help the non-regular users.

And thanks for the big welcome!