Upgrading the Delonghi Stilosa - Further mods, or next machine? [$700]

We've had our Delonghi Stilosa for just over a year, and in that time have used it every day for cappuccinos for 2. We purchased the Stilosa as a basic machine because we weren't sure we would use it much. Now that we have demonstrated that we will, we are ready to either:

• Upgrade to a better machine, or
• Do more mods/upgrades to the Stilosa

We use the following items/mods with the Stilosa:

• Took off the plastic steam wand cover and zip-tied the rubber part securely according to https://www.youtube.com/watch?v=tJDmF3zl0ug&t=40s
• Bottomless portafilter with puck screen
• Separate grinder where we grind fresh beans that we get on delivery from local coffee roaster
• Needle distribution tool, apex stone distributor, and press

We're happy with the Stilosa results. I am mostly annoyed at the time it takes to steam the milk for 2 cappuccinos. It takes 4 heating cycles on the steamer with waiting in between. Overall when we make our coffee it's a 15 minute time investment. I'd love to get this down to 5-10 min for our 2 drinks.

Any recommendations, either further mods for the Stilosa, or the "next step up" (or more steps up!) of machine?